stackabletech · soenkeliebau · May 18, 2022 · May 25, 2022 · May 25, 2022 · May 25, 2022
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,6 +15,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - `operator-rs` `0.10.0` -> `0.15.0` ([#218], [#223], [#230]).
+- [BREAKING] Specifying the product version has been changed to adhere to [ADR018](https://docs.stackable.tech/home/contributor/adr/ADR018-product_image_versioning.html) instead of just specifying the product version you will now have to add the Stackable image version as well, so `version: 3.5.8` becomes (for example) `version: 3.5.8-stackable0.1.0` ([#270])
 
 ### Removed
 
@@ -23,6 +24,7 @@ All notable changes to this project will be documented in this file.
 [#218]: https://github.com/stackabletech/nifi-operator/pull/218
 [#223]: https://github.com/stackabletech/nifi-operator/pull/223
 [#230]: https://github.com/stackabletech/nifi-operator/pull/230
+[#270]: https://github.com/stackabletech/nifi-operator/pull/270
 
 ## [0.5.0] - 2022-02-14
 

diff --git a/docs/modules/ROOT/pages/config_properties.adoc b/docs/modules/ROOT/pages/config_properties.adoc
@@ -9,7 +9,7 @@ kind: NifiCluster
 metadata:
   name: simple-nifi
 spec:
-  version: "1.15.0"
+  version: "1.15.0-stackable0.4.0"
   zookeeperConfigMapName: simple-nifi-znode
   authenticationConfig:
     method:

diff --git a/docs/modules/ROOT/pages/usage.adoc b/docs/modules/ROOT/pages/usage.adoc
@@ -4,7 +4,12 @@ If you are not installing the operator using Helm then after installation the CR
 
     kubectl apply -f deploy/nificluster.yaml
 
-To create a three-node Apache NiFi (v1.15.0) cluster with SingleUser authentication enabled apply the following to your Kubernetes cluster.
+To create a three-node Apache NiFi cluster with SingleUser authentication enabled apply the following to your Kubernetes cluster.
+
+Please note that the version you need to specify is not only the version of NiFi which you want to roll out, but has to be amended with a Stackable version as shown.
+This Stackable version is the version of the underlying container image which is used to execute the processes.
+For a list of available versions please check our https://repo.stackable.tech/#browse/browse:docker:v2%2Fstackable%2Fnifi%2Ftags[image registry].
+It should generally be safe to simply use the latest image version that is available.
 
 The admin credentials that you can then log in with are: `admin:supersecretpassword`
 
@@ -22,7 +27,7 @@ kind: NifiCluster
 metadata:
   name: simple-nifi
 spec:
-  version: "1.15.0"
+  version: "1.15.0-stackable0.4.0"
   zookeeperConfigMapName: simple-nifi-znode
   authenticationConfig:
     method:

diff --git a/examples/simple-nifi-cluster.yaml b/examples/simple-nifi-cluster.yaml
@@ -6,7 +6,7 @@ kind: ZookeeperCluster
 metadata:
   name: simple-zk
 spec:
-  version: 3.5.8
+  version: 3.5.8-stackable0.7.0
   servers:
     roleGroups:
       default:
@@ -37,7 +37,7 @@ kind: NifiCluster
 metadata:
   name: simple-nifi
 spec:
-  version: "1.15.0"
+  version: "1.15.0-stackable0.4.0"
   zookeeperConfigMapName: simple-nifi-znode
   authenticationConfig:
     method:

diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs
@@ -527,10 +527,7 @@ fn build_node_rolegroup_statefulset(
         .get(&rolegroup_ref.role_group);
 
     let nifi_version = nifi_version(nifi)?;
-    let image = format!(
-        "docker.stackable.tech/stackable/nifi:{}-stackable0",
-        nifi_version
-    );
+    let image = format!("docker.stackable.tech/stackable/nifi:{}", nifi_version);
 
     let node_address = format!(
         "$POD_NAME.{}-node-{}.{}.svc.cluster.local",

diff --git a/tests/templates/.gitkeep b/tests/templates/.gitkeep
diff --git a/tests/templates/kuttl/smoke/00-assert.yaml b/tests/templates/kuttl/smoke/00-assert.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-zk-server-default
+status:
+  readyReplicas: 1
+  replicas: 1
diff --git a/tests/templates/kuttl/smoke/00-install-zk.yaml.j2 b/tests/templates/kuttl/smoke/00-install-zk.yaml.j2
@@ -0,0 +1,22 @@
+---
+apiVersion: zookeeper.stackable.tech/v1alpha1
+kind: ZookeeperCluster
+metadata:
+  name: test-zk
+spec:
+  servers:
+    roleGroups:
+      default:
+        replicas: 1
+        config:
+          myidOffset: 10
+  version: {{ test_scenario['values']['zookeeper'] }}
+  stopped: false
+---
+apiVersion: zookeeper.stackable.tech/v1alpha1
+kind: ZookeeperZnode
+metadata:
+  name: test-nifi-znode
+spec:
+  clusterRef:
+    name: test-zk
diff --git a/tests/templates/kuttl/smoke/01-assert.yaml b/tests/templates/kuttl/smoke/01-assert.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+metadata:
+  name: install-nifi
+timeout: 1200
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-nifi-node-default
+status:
+  readyReplicas: 2
+  replicas: 2
diff --git a/tests/templates/kuttl/smoke/01-install-nifi.yaml.j2 b/tests/templates/kuttl/smoke/01-install-nifi.yaml.j2
@@ -0,0 +1,41 @@
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: nifi-admin-credentials-simple
+stringData:
+  username: admin
+  password: supersecretpassword
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: nifi-sensitive-property-key
+stringData:
+  nifiSensitivePropsKey: mYsUp3rS3cr3tk3y
+---
+apiVersion: nifi.stackable.tech/v1alpha1
+kind: NifiCluster
+metadata:
+  name: test-nifi
+spec:
+  version: {{ test_scenario['values']['nifi'] }}
+  zookeeperConfigMapName: test-nifi-znode
+  authenticationConfig:
+    method:
+      SingleUser:
+        adminCredentialsSecret:
+          name: nifi-admin-credentials-simple
+  sensitivePropertiesConfig:
+    keySecret: nifi-sensitive-property-key
+  nodes:
+    roleGroups:
+      default:
+        selector:
+          matchLabels:
+            kubernetes.io/os: linux
+        config:
+          log:
+            rootLogLevel: INFO
+        replicas: 2
+
diff --git a/tests/templates/kuttl/smoke/02-assert.yaml b/tests/templates/kuttl/smoke/02-assert.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-nifi-node-default
+status:
+  readyReplicas: 3
+  replicas: 3
diff --git a/tests/templates/kuttl/smoke/02-scale-up-nifi.yaml.j2 b/tests/templates/kuttl/smoke/02-scale-up-nifi.yaml.j2
@@ -0,0 +1,25 @@
+---
+apiVersion: nifi.stackable.tech/v1alpha1
+kind: NifiCluster
+metadata:
+  name: test-nifi
+spec:
+  version: {{ test_scenario['values']['nifi'] }}
+  zookeeperConfigMapName: test-nifi-znode
+  authenticationConfig:
+    method:
+      SingleUser:
+        adminCredentialsSecret:
+          name: nifi-admin-credentials-simple
+  sensitivePropertiesConfig:
+    keySecret: nifi-sensitive-property-key
+  nodes:
+    roleGroups:
+      default:
+        selector:
+          matchLabels:
+            kubernetes.io/os: linux
+        config:
+          log:
+            rootLogLevel: INFO
+        replicas: 3
diff --git a/tests/templates/kuttl/smoke/03-assert.yaml b/tests/templates/kuttl/smoke/03-assert.yaml
@@ -0,0 +1,14 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+metadata:
+  name: install-test-nifi
+timeout: 300
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-nifi
+status:
+  readyReplicas: 1
+  replicas: 1
diff --git a/tests/templates/kuttl/smoke/03-install-test-nifi.yaml b/tests/templates/kuttl/smoke/03-install-test-nifi.yaml
@@ -0,0 +1,22 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-nifi
+  labels:
+    app: test-nifi
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: test-nifi
+  template:
+    metadata:
+      labels:
+        app: test-nifi
+    spec:
+      containers:
+        - name: test-nifi
+          image: python:3.10-slim
+          stdin: true
+          tty: true
diff --git a/tests/templates/kuttl/smoke/04-assert.yaml b/tests/templates/kuttl/smoke/04-assert.yaml
@@ -0,0 +1,8 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+metadata:
+  name: test-nifi
+commands:
+  - script: kubectl exec -n $NAMESPACE test-nifi-0 -- python /tmp/test_nifi.py -u admin -p supersecretpassword -n $NAMESPACE
+  - script: kubectl exec -n $NAMESPACE test-nifi-0 -- python /tmp/test_nifi_metrics.py -n $NAMESPACE
diff --git a/tests/templates/kuttl/smoke/04-prepare-test-nifi.yaml b/tests/templates/kuttl/smoke/04-prepare-test-nifi.yaml
@@ -0,0 +1,9 @@
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: kubectl cp -n $NAMESPACE ./test_nifi_metrics.py  test-nifi-0:/tmp
+  - script: kubectl cp -n $NAMESPACE ./test_nifi.py  test-nifi-0:/tmp
+  - script: kubectl cp -n $NAMESPACE ./cacert.pem  test-nifi-0:/tmp
+  - script: kubectl cp -n $NAMESPACE ./requirements.txt test-nifi-0:/tmp
+  - script: kubectl exec -n $NAMESPACE test-nifi-0 -- pip install --user -r /tmp/requirements.txt
diff --git a/tests/templates/kuttl/smoke/05-assert.yaml b/tests/templates/kuttl/smoke/05-assert.yaml
@@ -0,0 +1,38 @@
+---
+apiVersion: v1
+kind: Event
+reason: Started
+source:
+  component: kubelet
+involvedObject:
+  apiVersion: v1
+  kind: Pod
+  name: test-nifi-node-default-0
+---
+apiVersion: v1
+kind: Event
+reason: Started
+source:
+  component: kubelet
+involvedObject:
+  apiVersion: v1
+  kind: Pod
+  name: test-nifi-node-default-1
+---
+apiVersion: v1
+kind: Event
+reason: Started
+source:
+  component: kubelet
+involvedObject:
+  apiVersion: v1
+  kind: Pod
+  name: test-nifi-node-default-2
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: test-nifi-node-default
+status:
+  readyReplicas: 3
+  replicas: 3
diff --git a/tests/templates/kuttl/smoke/05-enable-anonymous.yaml.j2 b/tests/templates/kuttl/smoke/05-enable-anonymous.yaml.j2
@@ -0,0 +1,30 @@
+---
+apiVersion: nifi.stackable.tech/v1alpha1
+kind: NifiCluster
+metadata:
+  name: test-nifi
+spec:
+  version: {{ test_scenario['values']['nifi'] }}
+  zookeeperConfigMapName: test-nifi-znode
+  authenticationConfig:
+    method:
+      SingleUser:
+        adminCredentialsSecret:
+          name: nifi-admin-credentials-simple
+    allowAnonymousAccess: true
+  nodes:
+    roleGroups:
+      default:
+        selector:
+          matchLabels:
+            kubernetes.io/os: linux
+        config:
+          sensitivePropertyKeySecret: nifi-sensitive-property-key
+          log:
+            rootLogLevel: INFO
+        replicas: 2
+---
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - command: kubectl rollout restart statefulset test-nifi-node-default --namespace $NAMESPACE
diff --git a/tests/templates/kuttl/smoke/cacert.pem b/tests/templates/kuttl/smoke/cacert.pem
@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIJAJ8/0entaUgnMA0GCSqGSIb3DQEBCwUAMCYxJDAiBgNV
+BAMMG3NlY3JldC1vcGVyYXRvciBzZWxmLXNpZ25lZDAeFw0yMjAxMTIxNDU3NDVa
+Fw0yNDAxMTIxNTAyNDVaMCYxJDAiBgNVBAMMG3NlY3JldC1vcGVyYXRvciBzZWxm
+LXNpZ25lZDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALLKNGhq5gE+
+mL9zFCLqtc22CLk8BSbjesjUEhBK3kxDvFDa2ou5atH0eUFjtOSszay2oBrCTVWK
+wZBsdUkL0HkW/wq9A8EUkQ8EownXnsxpI61CLNGLPpBZc+CRHhyWDD6BqwGvEHEv
+W546mh6k49//7zCiYfTK9/LCKBCFdDV6Sb7mNJ8HbNUj54uwC6iOgH25OCRDh4Bt
+zXoSrV9GLAm6AM25ZFo+ONOUBMtv7pavaR0CFMnAixl2NKV2wyLBYAYnJgdJFzGD
+8mP6HwuR7e2g7PkcyC01EnX4iOIuuKHT/Xl9ynut4nHI7g6popotgashrQ5Jf8MS
+Kf98O12LzSMCAwEAAaOBhTCBgjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRf
+U9OxCBwCqYiUjWqY05sz3a6cmjBABgNVHSMEOTA3oSqkKDAmMSQwIgYDVQQDDBtz
+ZWNyZXQtb3BlcmF0b3Igc2VsZi1zaWduZWSCCQCfP9Hp7WlIJzAOBgNVHQ8BAf8E
+BAMCAYYwDQYJKoZIhvcNAQELBQADggEBAA8Flk1XOb1pH33Mbie5ronP2xw/xf6t
+Ox3PBEZ+5/jSPdIwoSaRp9JoP0L9Rg68jzcl5QMa4pOYWe+C1q8aZP0tjfq1eJfO
+UD5ik2DQgEuoF1ELgW1xoM38vkd8wgE711swDHK2zAsOudSzO4XZ4rQ6kaXXtoej
+2kFhxDYcC+na90LdkJM0kAqrjxlFaP7WgUK+HA2iN00CFSOI9FVdppLtootbcb+y
++WfXxM7gA9Exg4f2vKGVx7UxB/k4AbPvogBQZvK8VoAQocAhWrw7o2rqAesAw6JD
+WwQjM69TlEfbHYXtTfMbi01Wi5TtVhFCjyXK6KDsqSgU+9McExIy70k=
+-----END CERTIFICATE-----
diff --git a/tests/templates/kuttl/smoke/requirements.txt b/tests/templates/kuttl/smoke/requirements.txt
@@ -0,0 +1 @@
+requests==2.27.1