diff --git a/docs/modules/nifi/examples/getting_started/getting_started.sh b/docs/modules/nifi/examples/getting_started/getting_started.sh index 4c0a1c80..89e8b9e1 100755 --- a/docs/modules/nifi/examples/getting_started/getting_started.sh +++ b/docs/modules/nifi/examples/getting_started/getting_started.sh @@ -62,7 +62,7 @@ stringData: apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: - name: simple-nifi-users + name: broken-nifi-users spec: provider: static: @@ -78,13 +78,13 @@ kubectl apply -f - < - name: nifi-processors configMap: @@ -165,7 +165,7 @@ spec: sensitiveProperties: keySecret: nifi-sensitive-property-key autoGenerate: true - zookeeperConfigMapName: simple-nifi-znode + zookeeperConfigMapName: broken-nifi-znode nodes: roleConfig: listenerClass: external-unstable @@ -271,13 +271,13 @@ After this is done, your components are available within the NiFi Pods and NiFi apiVersion: nifi.stackable.tech/v1alpha1 kind: NifiCluster metadata: - name: simple-nifi + name: broken-nifi spec: image: productVersion: 2.2.0 clusterConfig: authentication: - - authenticationClass: simple-nifi-admin-user + - authenticationClass: broken-nifi-admin-user extraVolumes: # <1> - name: nifi-processors persistentVolumeClaim: @@ -285,7 +285,7 @@ spec: sensitiveProperties: keySecret: nifi-sensitive-property-key autoGenerate: true - zookeeperConfigMapName: simple-nifi-znode + zookeeperConfigMapName: broken-nifi-znode nodes: roleConfig: listenerClass: external-unstable diff --git a/docs/modules/nifi/pages/usage_guide/exposing-processors/http.adoc b/docs/modules/nifi/pages/usage_guide/exposing-processors/http.adoc index 0222b163..686e7133 100644 --- a/docs/modules/nifi/pages/usage_guide/exposing-processors/http.adoc +++ b/docs/modules/nifi/pages/usage_guide/exposing-processors/http.adoc @@ -24,19 +24,19 @@ image:listen-http-1.png[A ListenHTTP processor] Afterwards you need to expose the processor to the outside world. For that to work, first create a Service object as follows. -In this guide, the NifiCluster is called `simple-nifi`. The name of the Nifi cluster must match the value of the `app.kubernetes.io/instance` as shown below. +In this guide, the NifiCluster is called `broken-nifi`. The name of the Nifi cluster must match the value of the `app.kubernetes.io/instance` as shown below. [source,yaml] ---- apiVersion: v1 kind: Service metadata: - name: simple-nifi-listen-http # Update according to NifiCluster name + name: broken-nifi-listen-http # Update according to NifiCluster name spec: type: ClusterIP selector: app.kubernetes.io/component: node - app.kubernetes.io/instance: simple-nifi # Update according to NifiCluster name + app.kubernetes.io/instance: broken-nifi # Update according to NifiCluster name app.kubernetes.io/name: nifi ports: - name: http @@ -53,17 +53,17 @@ If you are using an ingress controller, an Ingress could look something like apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: simple-nifi-listen-http # Update according to NifiCluster name + name: broken-nifi-listen-http # Update according to NifiCluster name spec: rules: - - host: simple-nifi-listen-http.my.corp # Update to your host + - host: broken-nifi-listen-http.my.corp # Update to your host http: paths: - pathType: Prefix path: / backend: service: - name: simple-nifi-listen-http # Update to your Service name + name: broken-nifi-listen-http # Update to your Service name port: number: 8042 ---- @@ -78,7 +78,7 @@ Start the `ListenHTTP` processor. image:listen-http-2.png[´RouteOnAttribute connected to ListenHTTP processor] The `ListenHTTP` processor should now generate a FlowFile for every incoming HTTP request. -You can test this by calling `curl --verbose --data '{"hello":"NiFi"}' https://simple-nifi-listen-http.my.corp`, you should get a `HTTP/2 200` response. +You can test this by calling `curl --verbose --data '{"hello":"NiFi"}' https://broken-nifi-listen-http.my.corp`, you should get a `HTTP/2 200` response. TIP: If you get a `503 Service Temporarily Unavailable`, this probably means your Ingress controller was not able to reach your `ListenHTTP` processor. Check that the processor is running and configured correctly. diff --git a/docs/modules/nifi/pages/usage_guide/exposing-processors/tcp.adoc b/docs/modules/nifi/pages/usage_guide/exposing-processors/tcp.adoc index 213fffec..2d6e5973 100644 --- a/docs/modules/nifi/pages/usage_guide/exposing-processors/tcp.adoc +++ b/docs/modules/nifi/pages/usage_guide/exposing-processors/tcp.adoc @@ -9,7 +9,7 @@ Stackable doesn't place any restriction on the type of service that can be used == Example An example for this is shown below. -It consists of a NiFi cluster with three nodes called `simple-nifi` and has a processor that listens to a TCP port and forwards lines written into that port as flowfiles. +It consists of a NiFi cluster with three nodes called `broken-nifi` and has a processor that listens to a TCP port and forwards lines written into that port as flowfiles. image:listening-processor-example.png[A ListenTCP processor] @@ -30,7 +30,7 @@ spec: selector: app.kubernetes.io/name: nifi app.kubernetes.io/component: node - app.kubernetes.io/instance: simple-nifi + app.kubernetes.io/instance: broken-nifi ports: - name: tcp-port protocol: TCP @@ -55,7 +55,7 @@ spec: selector: app.kubernetes.io/name: nifi app.kubernetes.io/component: node - app.kubernetes.io/instance: simple-nifi + app.kubernetes.io/instance: broken-nifi ports: - port: 8123 protocol: TCP diff --git a/docs/modules/nifi/pages/usage_guide/index.adoc b/docs/modules/nifi/pages/usage_guide/index.adoc index adaf1f60..9511886e 100644 --- a/docs/modules/nifi/pages/usage_guide/index.adoc +++ b/docs/modules/nifi/pages/usage_guide/index.adoc @@ -14,14 +14,14 @@ The following listing shows an example configuration: apiVersion: nifi.stackable.tech/v1alpha1 kind: NifiCluster metadata: - name: simple-nifi + name: broken-nifi spec: image: productVersion: 1.27.0 clusterConfig: - zookeeperConfigMapName: simple-nifi-znode # <1> + zookeeperConfigMapName: broken-nifi-znode # <1> authentication: # <2> - - authenticationClass: simple-nifi-admin-user + - authenticationClass: broken-nifi-admin-user extraVolumes: # <3> - name: nifi-client-certs secret: diff --git a/docs/modules/nifi/pages/usage_guide/monitoring.adoc b/docs/modules/nifi/pages/usage_guide/monitoring.adoc index 3a093f87..a386940c 100644 --- a/docs/modules/nifi/pages/usage_guide/monitoring.adoc +++ b/docs/modules/nifi/pages/usage_guide/monitoring.adoc @@ -38,14 +38,14 @@ spec: The Prometheus Reporting Task was removed in NiFi `2.x.x` in https://issues.apache.org/jira/browse/NIFI-13507[NIFI-13507,window=_blank]. Metrics are now always exposed and can be scraped using the NiFi `metrics` Service and the HTTP path `/nifi-api/flow/metrics/prometheus`. -For a deployed NiFi cluster called `simple-nifi`, containing a rolegroup called `default`, the metrics endpoint is reachable under: +For a deployed NiFi cluster called `broken-nifi`, containing a rolegroup called `default`, the metrics endpoint is reachable under: ``` -https://simple-nifi-node-default-metrics..svc.cluster.local:8443/nifi-api/flow/metrics/prometheus +https://broken-nifi-node-default-metrics..svc.cluster.local:8443/nifi-api/flow/metrics/prometheus ``` NOTE: The above URL connects to one of the Pods, reachable through the specified Service, therefore scraping metrics produced by that Pod only. -To scrape metrics from a particular Pod, the FQDN of the Pod and the `headless` Service need to be used. For example: `\https://simple-nifi-node-default-0.simple-nifi-node-default-headless..svc.cluster.local:8443/nifi-api/flow/metrics/prometheus` +To scrape metrics from a particular Pod, the FQDN of the Pod and the `headless` Service need to be used. For example: `\https://broken-nifi-node-default-0.broken-nifi-node-default-headless..svc.cluster.local:8443/nifi-api/flow/metrics/prometheus` IMPORTANT: If NiFi is configured to do any user authentication, requests to the metrics endpoint must be authenticated and authorized. diff --git a/docs/modules/nifi/pages/usage_guide/security.adoc b/docs/modules/nifi/pages/usage_guide/security.adoc index 9cb85311..04f2a595 100644 --- a/docs/modules/nifi/pages/usage_guide/security.adoc +++ b/docs/modules/nifi/pages/usage_guide/security.adoc @@ -47,7 +47,7 @@ However, due to it being a single user with all rights, this is not recommended apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: - name: simple-nifi-users # <1> + name: broken-nifi-users # <1> spec: provider: static: @@ -82,7 +82,7 @@ stringData: spec: clusterConfig: authentication: - - authenticationClass: simple-nifi-users # <1> + - authenticationClass: broken-nifi-users # <1> ---- <1> The reference to an AuthenticationClass. NiFi only supports one authentication mechanism at a time. @@ -437,7 +437,7 @@ Alternatively, you can use this shell script to automatically execute this in ea [source,bash] ---- NAMESPACE="default" -STATEFULSET_NAME="simple-nifi-node-default" +STATEFULSET_NAME="broken-nifi-node-default" COMMAND="/stackable/nifi/bin/nifi.sh set-sensitive-properties-algorithm NIFI_PBKDF2_AES_GCM_256" kubectl get pods -n "$NAMESPACE" --no-headers -o custom-columns=":metadata.name" | grep "^$STATEFULSET_NAME" | \ diff --git a/docs/modules/nifi/pages/usage_guide/updating.adoc b/docs/modules/nifi/pages/usage_guide/updating.adoc index 44209e1a..f75a87d4 100644 --- a/docs/modules/nifi/pages/usage_guide/updating.adoc +++ b/docs/modules/nifi/pages/usage_guide/updating.adoc @@ -9,7 +9,7 @@ Continuing the example above, to change the deployed version from `1.27.0` to `2 apiVersion: nifi.stackable.tech/v1alpha1 kind: NifiCluster metadata: - name: simple-nifi + name: broken-nifi spec: image: productVersion: 2.0.0 # <1> diff --git a/examples/simple-nifi-cluster.yaml b/examples/simple-nifi-cluster.yaml index a8b2d033..5d253765 100644 --- a/examples/simple-nifi-cluster.yaml +++ b/examples/simple-nifi-cluster.yaml @@ -1,5 +1,5 @@ # Deploy a NiFi cluster, a user secret and a ZooKeeper cluster and a respective -# ZNode `simple-nifi-znode` which will be referenced +# ZNode `broken-nifi-znode` which will be referenced --- apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperCluster @@ -16,7 +16,7 @@ spec: apiVersion: zookeeper.stackable.tech/v1alpha1 kind: ZookeeperZnode metadata: - name: simple-nifi-znode + name: broken-nifi-znode spec: clusterRef: name: simple-zk @@ -24,17 +24,17 @@ spec: apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: - name: simple-nifi-admin-user + name: broken-nifi-admin-user spec: provider: static: userCredentialsSecret: - name: simple-nifi-admin-user-secret + name: broken-nifi-admin-user-secret --- apiVersion: v1 kind: Secret metadata: - name: simple-nifi-admin-user-secret + name: broken-nifi-admin-user-secret stringData: # The admin user is required for a working single user NiFi deployment. The password can be changed as desired. admin: admin @@ -44,17 +44,17 @@ stringData: apiVersion: nifi.stackable.tech/v1alpha1 kind: NifiCluster metadata: - name: simple-nifi + name: broken-nifi spec: image: productVersion: 1.27.0 clusterConfig: authentication: - - authenticationClass: simple-nifi-admin-user + - authenticationClass: broken-nifi-admin-user sensitiveProperties: keySecret: nifi-sensitive-property-key autoGenerate: true - zookeeperConfigMapName: simple-nifi-znode + zookeeperConfigMapName: broken-nifi-znode nodes: roleConfig: listenerClass: external-unstable diff --git a/rust/operator-binary/src/config/mod.rs b/rust/operator-binary/src/config/mod.rs index 3ddfa6da..246feed5 100644 --- a/rust/operator-binary/src/config/mod.rs +++ b/rust/operator-binary/src/config/mod.rs @@ -796,7 +796,7 @@ mod tests { apiVersion: nifi.stackable.tech/v1alpha1 kind: NifiCluster metadata: - name: simple-nifi + name: broken-nifi spec: image: productVersion: 1.27.0 @@ -804,9 +804,9 @@ mod tests { authentication: - authenticationClass: nifi-admin-credentials-simple sensitiveProperties: - keySecret: simple-nifi-sensitive-property-key + keySecret: broken-nifi-sensitive-property-key autoGenerate: true - zookeeperConfigMapName: simple-nifi-znode + zookeeperConfigMapName: broken-nifi-znode nodes: roleGroups: default: @@ -845,7 +845,7 @@ mod tests { apiVersion: nifi.stackable.tech/v1alpha1 kind: NifiCluster metadata: - name: simple-nifi + name: broken-nifi spec: image: productVersion: 1.27.0 @@ -853,9 +853,9 @@ mod tests { authentication: - authenticationClass: nifi-admin-credentials-simple sensitiveProperties: - keySecret: simple-nifi-sensitive-property-key + keySecret: broken-nifi-sensitive-property-key autoGenerate: true - zookeeperConfigMapName: simple-nifi-znode + zookeeperConfigMapName: broken-nifi-znode nodes: config: resources: diff --git a/rust/operator-binary/src/crd/affinity.rs b/rust/operator-binary/src/crd/affinity.rs index ac1e570e..567dc627 100644 --- a/rust/operator-binary/src/crd/affinity.rs +++ b/rust/operator-binary/src/crd/affinity.rs @@ -40,7 +40,7 @@ mod tests { apiVersion: nifi.stackable.tech/v1alpha1 kind: NifiCluster metadata: - name: simple-nifi + name: broken-nifi spec: image: productVersion: 1.27.0 @@ -48,9 +48,9 @@ mod tests { authentication: - authenticationClass: nifi-admin-credentials-simple sensitiveProperties: - keySecret: simple-nifi-sensitive-property-key + keySecret: broken-nifi-sensitive-property-key autoGenerate: true - zookeeperConfigMapName: simple-nifi-znode + zookeeperConfigMapName: broken-nifi-znode nodes: roleGroups: default: @@ -75,7 +75,7 @@ mod tests { ("app.kubernetes.io/name".to_string(), "nifi".to_string(),), ( "app.kubernetes.io/instance".to_string(), - "simple-nifi".to_string(), + "broken-nifi".to_string(), ), ( "app.kubernetes.io/component".to_string(), diff --git a/tests/templates/kuttl/cluster_operation/20-install-nifi.yaml.j2 b/tests/templates/kuttl/cluster_operation/20-install-nifi.yaml.j2 index deb17ac4..c2358529 100644 --- a/tests/templates/kuttl/cluster_operation/20-install-nifi.yaml.j2 +++ b/tests/templates/kuttl/cluster_operation/20-install-nifi.yaml.j2 @@ -2,17 +2,17 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: - name: simple-nifi-users + name: broken-nifi-users spec: provider: static: userCredentialsSecret: - name: simple-nifi-admin-credentials + name: broken-nifi-admin-credentials --- apiVersion: v1 kind: Secret metadata: - name: simple-nifi-admin-credentials + name: broken-nifi-admin-credentials stringData: admin: supersecretpassword --- @@ -39,7 +39,7 @@ spec: pullPolicy: IfNotPresent clusterConfig: authentication: - - authenticationClass: simple-nifi-users + - authenticationClass: broken-nifi-users sensitiveProperties: keySecret: nifi-sensitive-property-key {% if lookup('env', 'VECTOR_AGGREGATOR') %} diff --git a/tests/templates/kuttl/cluster_operation/30-stop-nifi.yaml.j2 b/tests/templates/kuttl/cluster_operation/30-stop-nifi.yaml.j2 index e78083bf..cc83e32b 100644 --- a/tests/templates/kuttl/cluster_operation/30-stop-nifi.yaml.j2 +++ b/tests/templates/kuttl/cluster_operation/30-stop-nifi.yaml.j2 @@ -15,7 +15,7 @@ spec: pullPolicy: IfNotPresent clusterConfig: authentication: - - authenticationClass: simple-nifi-users + - authenticationClass: broken-nifi-users sensitiveProperties: keySecret: nifi-sensitive-property-key {% if lookup('env', 'VECTOR_AGGREGATOR') %} diff --git a/tests/templates/kuttl/cluster_operation/40-pause-nifi.yaml.j2 b/tests/templates/kuttl/cluster_operation/40-pause-nifi.yaml.j2 index 85f71533..404c9867 100644 --- a/tests/templates/kuttl/cluster_operation/40-pause-nifi.yaml.j2 +++ b/tests/templates/kuttl/cluster_operation/40-pause-nifi.yaml.j2 @@ -15,7 +15,7 @@ spec: pullPolicy: IfNotPresent clusterConfig: authentication: - - authenticationClass: simple-nifi-users + - authenticationClass: broken-nifi-users sensitiveProperties: keySecret: nifi-sensitive-property-key {% if lookup('env', 'VECTOR_AGGREGATOR') %} diff --git a/tests/templates/kuttl/cluster_operation/50-restart-nifi.yaml.j2 b/tests/templates/kuttl/cluster_operation/50-restart-nifi.yaml.j2 index 4c50747e..b461e92b 100644 --- a/tests/templates/kuttl/cluster_operation/50-restart-nifi.yaml.j2 +++ b/tests/templates/kuttl/cluster_operation/50-restart-nifi.yaml.j2 @@ -15,7 +15,7 @@ spec: pullPolicy: IfNotPresent clusterConfig: authentication: - - authenticationClass: simple-nifi-users + - authenticationClass: broken-nifi-users sensitiveProperties: keySecret: nifi-sensitive-property-key {% if lookup('env', 'VECTOR_AGGREGATOR') %} diff --git a/tests/templates/kuttl/external-access/30_nifi.yaml.j2 b/tests/templates/kuttl/external-access/30_nifi.yaml.j2 index dd621497..8e9fbad4 100644 --- a/tests/templates/kuttl/external-access/30_nifi.yaml.j2 +++ b/tests/templates/kuttl/external-access/30_nifi.yaml.j2 @@ -2,17 +2,17 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: - name: simple-nifi-users + name: broken-nifi-users spec: provider: static: userCredentialsSecret: - name: simple-nifi-admin-credentials + name: broken-nifi-admin-credentials --- apiVersion: v1 kind: Secret metadata: - name: simple-nifi-admin-credentials + name: broken-nifi-admin-credentials stringData: admin: > passwordWithSpecialCharacter\@<&>"' @@ -41,7 +41,7 @@ spec: clusterConfig: zookeeperConfigMapName: test-nifi-znode authentication: - - authenticationClass: simple-nifi-users + - authenticationClass: broken-nifi-users hostHeaderCheck: allowAll: false sensitiveProperties: diff --git a/tests/templates/kuttl/logging/04-install-nifi.yaml.j2 b/tests/templates/kuttl/logging/04-install-nifi.yaml.j2 index a04ef2a4..714ecec4 100644 --- a/tests/templates/kuttl/logging/04-install-nifi.yaml.j2 +++ b/tests/templates/kuttl/logging/04-install-nifi.yaml.j2 @@ -2,17 +2,17 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: - name: simple-nifi-users + name: broken-nifi-users spec: provider: static: userCredentialsSecret: - name: simple-nifi-admin-credentials + name: broken-nifi-admin-credentials --- apiVersion: v1 kind: Secret metadata: - name: simple-nifi-admin-credentials + name: broken-nifi-admin-credentials stringData: admin: supersecretpassword --- @@ -93,7 +93,7 @@ spec: pullPolicy: IfNotPresent clusterConfig: authentication: - - authenticationClass: simple-nifi-users + - authenticationClass: broken-nifi-users sensitiveProperties: keySecret: nifi-sensitive-property-key customComponentsGitSync: diff --git a/tests/templates/kuttl/orphaned_resources/02-install-nifi.yaml.j2 b/tests/templates/kuttl/orphaned_resources/02-install-nifi.yaml.j2 index 43ed9fb4..c92611d5 100644 --- a/tests/templates/kuttl/orphaned_resources/02-install-nifi.yaml.j2 +++ b/tests/templates/kuttl/orphaned_resources/02-install-nifi.yaml.j2 @@ -2,17 +2,17 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: - name: simple-nifi-users + name: broken-nifi-users spec: provider: static: userCredentialsSecret: - name: simple-nifi-admin-credentials + name: broken-nifi-admin-credentials --- apiVersion: v1 kind: Secret metadata: - name: simple-nifi-admin-credentials + name: broken-nifi-admin-credentials stringData: admin: supersecretpassword --- @@ -39,7 +39,7 @@ spec: pullPolicy: IfNotPresent clusterConfig: authentication: - - authenticationClass: simple-nifi-users + - authenticationClass: broken-nifi-users sensitiveProperties: keySecret: nifi-sensitive-property-key {% if lookup('env', 'VECTOR_AGGREGATOR') %} diff --git a/tests/templates/kuttl/resources/02-install-nifi.yaml.j2 b/tests/templates/kuttl/resources/02-install-nifi.yaml.j2 index d6aeee86..e9f1ad3a 100644 --- a/tests/templates/kuttl/resources/02-install-nifi.yaml.j2 +++ b/tests/templates/kuttl/resources/02-install-nifi.yaml.j2 @@ -2,17 +2,17 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: - name: simple-nifi-users + name: broken-nifi-users spec: provider: static: userCredentialsSecret: - name: simple-nifi-admin-credentials + name: broken-nifi-admin-credentials --- apiVersion: v1 kind: Secret metadata: - name: simple-nifi-admin-credentials + name: broken-nifi-admin-credentials stringData: admin: supersecretpassword --- @@ -39,7 +39,7 @@ spec: pullPolicy: IfNotPresent clusterConfig: authentication: - - authenticationClass: simple-nifi-users + - authenticationClass: broken-nifi-users sensitiveProperties: keySecret: nifi-sensitive-property-key {% if lookup('env', 'VECTOR_AGGREGATOR') %} diff --git a/tests/templates/kuttl/upgrade/02-install-nifi.yaml.j2 b/tests/templates/kuttl/upgrade/02-install-nifi.yaml.j2 index 47337032..cb113b26 100644 --- a/tests/templates/kuttl/upgrade/02-install-nifi.yaml.j2 +++ b/tests/templates/kuttl/upgrade/02-install-nifi.yaml.j2 @@ -2,17 +2,17 @@ apiVersion: authentication.stackable.tech/v1alpha1 kind: AuthenticationClass metadata: - name: simple-nifi-users + name: broken-nifi-users spec: provider: static: userCredentialsSecret: - name: simple-nifi-admin-credentials + name: broken-nifi-admin-credentials --- apiVersion: v1 kind: Secret metadata: - name: simple-nifi-admin-credentials + name: broken-nifi-admin-credentials stringData: admin: supersecretpassword --- @@ -39,7 +39,7 @@ spec: pullPolicy: IfNotPresent clusterConfig: authentication: - - authenticationClass: simple-nifi-users + - authenticationClass: broken-nifi-users sensitiveProperties: keySecret: nifi-sensitive-property-key {% if lookup('env', 'VECTOR_AGGREGATOR') %}