Add NiFi versions 1.27.0 and 2.0.0-M4 (#639)

* bump versions * use lowercase in reporting task name * bump version in affinity test * fix linter * adapted changelog * fix order * bump 1.26.0 to 1.27.0
stackabletech · Jul 16, 2024 · 3a6c018 · 3a6c018
1 parent 49cd462
commit 3a6c018
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 29 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,14 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
-### Fixed
-
-- Use [config-utils](https://github.com/stackabletech/config-utils/) for text-replacement of variables in configs.
-  This fixes escaping problems, especially when you have special characters in your password ([#627]).
-
 ### Added
 
 - Support specifying the SecretClass that is used to obtain TLS certificates ([#622]).
+- Support for NiFi `1.27.0` and `2.0.0-M4` ([#639]).
 
 ### Changed
 
@@ -22,13 +18,20 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 
+- Use [config-utils](https://github.com/stackabletech/config-utils/) for text-replacement of variables in configs.
+  This fixes escaping problems, especially when you have special characters in your password ([#627]).
 - Processing of corrupted log events fixed; If errors occur, the error
   messages are added to the log event ([#628]).
 
+### Removed
+
+- Removed support for `1.23.2` ([#639]).
+
 [#616]: https://github.com/stackabletech/nifi-operator/pull/616
 [#622]: https://github.com/stackabletech/nifi-operator/pull/622
 [#627]: https://github.com/stackabletech/nifi-operator/pull/627
 [#628]: https://github.com/stackabletech/nifi-operator/pull/628
+[#639]: https://github.com/stackabletech/nifi-operator/pull/639
 [#641]: https://github.com/stackabletech/nifi-operator/pull/641
 [#642]: https://github.com/stackabletech/nifi-operator/pull/642
 

diff --git a/docs/modules/nifi/examples/getting_started/getting_started.sh b/docs/modules/nifi/examples/getting_started/getting_started.sh
@@ -143,7 +143,7 @@ metadata:
   name: simple-nifi
 spec:
   image:
-    productVersion: 1.25.0
+    productVersion: 1.27.0
   clusterConfig:
     authentication:
       - authenticationClass: simple-nifi-users

diff --git a/docs/modules/nifi/examples/getting_started/getting_started.sh.j2 b/docs/modules/nifi/examples/getting_started/getting_started.sh.j2
@@ -81,7 +81,7 @@ metadata:
   name: simple-zk
 spec:
   image:
-    productVersion: 3.8.3
+    productVersion: 3.9.2
   servers:
     roleGroups:
       default:
@@ -143,7 +143,7 @@ metadata:
   name: simple-nifi
 spec:
   image:
-    productVersion: 1.25.0
+    productVersion: 1.27.0
   clusterConfig:
     authentication:
       - authenticationClass: simple-nifi-users

diff --git a/docs/modules/nifi/pages/usage_guide/custom_processors.adoc b/docs/modules/nifi/pages/usage_guide/custom_processors.adoc
@@ -19,7 +19,7 @@ The basic Dockerfile below shows how to achieve this:
 
 [source,Dockerfile]
 ----
-FROM docker.stackable.tech/stackable/nifi:1.25.0-stackable0.0.0-dev
+FROM docker.stackable.tech/stackable/nifi:1.27.0-stackable0.0.0-dev
 COPY /path/to/your/nar.file /stackable/nifi/lib/
 ----
 
@@ -29,8 +29,8 @@ You then need to make this image available to your Kubernetes cluster and specif
 ----
 spec:
   image:
-    productVersion: 1.25.0
-    custom: "docker.company.org/nifi:1.25.0-customprocessor"
+    productVersion: 1.27.0
+    custom: "docker.company.org/nifi:1.27.0-customprocessor"
 ----
 
 Also read the xref:guides:custom-images.adoc[Using customized product images] guide for additional information.
@@ -99,7 +99,7 @@ metadata:
   name: simple-nifi
 spec:
   image:
-    productVersion: 1.25.0
+    productVersion: 1.27.0
   clusterConfig:
     authentication:
       - authenticationClass: simple-nifi-admin-user

diff --git a/docs/modules/nifi/pages/usage_guide/index.adoc b/docs/modules/nifi/pages/usage_guide/index.adoc
@@ -16,7 +16,7 @@ metadata:
   name: simple-nifi
 spec:
   image:
-    productVersion: 1.25.0
+    productVersion: 1.27.0
   clusterConfig:
     zookeeperConfigMapName: simple-nifi-znode  # <1>
     authentication:  # <2>

diff --git a/docs/modules/nifi/pages/usage_guide/updating.adoc b/docs/modules/nifi/pages/usage_guide/updating.adoc
@@ -1,7 +1,7 @@
 = Updating NiFi
 
 Updating (or downgrading for that matter) the deployed version of NiFi is as simple as changing the version stated in the CRD.
-Continuing the example above, to change the deployed version from `1.25.0` to `1.21.0` you'd simply deploy the following CRD.
+Continuing the example above, to change the deployed version from `1.27.0` to `1.25.0` you'd simply deploy the following CRD.
 
 [source,yaml]
 ----
@@ -11,7 +11,7 @@ metadata:
   name: simple-nifi
 spec:
   image:
-    productVersion: 1.21.0 # <1>
+    productVersion: 1.25.0 # <1>
   clusterConfig:
     authentication:
       - authenticationClass: simple-nifi-admin-user

diff --git a/docs/modules/nifi/partials/supported-versions.adoc b/docs/modules/nifi/partials/supported-versions.adoc
@@ -2,6 +2,7 @@
 // This is a separate file, since it is used by both the direct NiFi-Operator documentation, and the overarching
 // Stackable Platform documentation.
 
+- 2.0.0-M4 (experimental)
+- 1.27.0 (LTS)
 - 1.25.0
-- 1.23.2 (deprecated)
-- 1.21.0 (LTS)
+- 1.21.0 (deprecated)
diff --git a/examples/simple-nifi-cluster.yaml b/examples/simple-nifi-cluster.yaml
@@ -7,7 +7,7 @@ metadata:
   name: simple-zk
 spec:
   image:
-    productVersion: 3.9.1
+    productVersion: 3.9.2
   servers:
     roleGroups:
       default:
@@ -47,7 +47,7 @@ metadata:
   name: simple-nifi
 spec:
   image:
-    productVersion: 1.25.0
+    productVersion: 1.27.0
   clusterConfig:
     authentication:
       - authenticationClass: simple-nifi-admin-user

diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs
@@ -43,7 +43,7 @@ mod tests {
           name: simple-nifi
         spec:
           image:
-            productVersion: 1.23.2
+            productVersion: 1.27.0
           clusterConfig:
             authentication:
               - authenticationClass: nifi-admin-credentials-simple

diff --git a/rust/operator-binary/src/reporting_task/mod.rs b/rust/operator-binary/src/reporting_task/mod.rs
@@ -291,7 +291,7 @@ fn build_reporting_task_job(
     let job_name = format!(
         "{}-create-reporting-task-{}",
         nifi.name_any(),
-        product_version.replace('.', "-")
+        product_version.replace('.', "-").to_ascii_lowercase()
     );
 
     let mut pb = PodBuilder::new();

diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
@@ -6,33 +6,34 @@
 dimensions:
   - name: zookeeper
     values:
-      - 3.8.3
+      - 3.8.4
   - name: zookeeper-latest
     values:
       - 3.9.2
   - name: nifi
     values:
       - 1.21.0
-      - 1.23.2
       - 1.25.0
+      - 1.27.0
+      - 2.0.0-M4
       # Alternatively, if you want to use a custom image, append a comma and the full image name to the product version
       # as in the example below.
-      # - 1.25.0,docker.stackable.tech/sandbox/nifi:1.25.0-stackable0.0.0-dev
+      # - 1.27.0,docker.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev
   - name: nifi_old
     values:
-      - 1.21.0
+      - 1.25.0
   - name: nifi_new
     values:
-      - 1.25.0
+      - 1.27.0
       # Alternatively, if you want to use a custom image, append a comma and the full image name to the product version
       # as in the example below.
-      # - 1.25.0,docker.stackable.tech/sandbox/nifi:1.25.0-stackable0.0.0-dev
+      # - 1.27.0,docker.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev
   - name: nifi-latest
     values:
-      - 1.25.0
+      - 1.27.0
       # Alternatively, if you want to use a custom image, append a comma and the full image name to the product version
       # as in the example below.
-      # - 1.25.0,docker.stackable.tech/sandbox/nifi:1.25.0-stackable0.0.0-dev
+      # - 1.27.0,docker.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev
   - name: ldap-use-tls
     values:
       - "false"