Support nifi 1.25.0 (#571)

* Merge branch 'main' of https://github.com/stackabletech/nifi-operator into main * adapted changelog * bump vector aggregator * reactoring, add service to reporting task * docs & refactoring * clippy * add jwt error message * adapted changelog * fix linter * Update rust/operator-binary/src/security/tls.rs Co-authored-by: Sebastian Bernauer <[email protected]> * always return a selector or error out * fix linter --------- Co-authored-by: Sebastian Bernauer <[email protected]>
stackabletech · Feb 21, 2024 · 52b8346 · 52b8346
1 parent 4ee8dd4
commit 52b8346
Show file tree

Hide file tree

Showing 18 changed files with 593 additions and 260 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,10 +9,16 @@ All notable changes to this project will be documented in this file.
 - Various documentation of the CRD ([#537]).
 - Document support for Apache Iceberg extensions ([#556]).
 - Helm: support labels in values.yaml ([#560]).
+- Support for NiFi `1.25.0` ([#571]).
+
+### Changed
+
+- A service for a single NiFi node is created for the reporting task to avoid JWT issues ([#571]).
 
 [#537]: https://github.com/stackabletech/nifi-operator/pull/537
 [#556]: https://github.com/stackabletech/nifi-operator/pull/556
 [#560]: https://github.com/stackabletech/nifi-operator/pull/560
+[#571]: https://github.com/stackabletech/nifi-operator/pull/571
 
 ## [23.11.0] - 2023-11-24
 

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.23.2
+    productVersion: 1.25.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
@@ -143,7 +143,7 @@ metadata:
   name: simple-nifi
 spec:
   image:
-    productVersion: 1.23.2
+    productVersion: 1.25.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
@@ -18,7 +18,7 @@ A simple Dockerfile would look like show in the following listing.
 
 [source,Dockerfile]
 ----
-FROM docker.stackable.tech/stackable/nifi:1.23.2-stackable0.0.0-dev
+FROM docker.stackable.tech/stackable/nifi:1.25.0-stackable0.0.0-dev
 COPY /path/to/your/nar.file /stackable/nifi/lib/
 ----
 
@@ -28,8 +28,8 @@ You then need to make this image available to your Kubernetes cluster and specif
 ----
 spec:
   image:
-    productVersion: 1.23.2
-    custom: "docker.company.org/nifi:1.23.2-customprocessor"
+    productVersion: 1.25.0
+    custom: "docker.company.org/nifi:1.25.0-customprocessor"
 ----
 
 == Using the Official Image
@@ -96,7 +96,7 @@ metadata:
   name: simple-nifi
 spec:
   image:
-    productVersion: 1.23.2
+    productVersion: 1.25.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
@@ -13,7 +13,7 @@ metadata:
   name: simple-nifi
 spec:
   image:
-    productVersion: 1.23.2
+    productVersion: 1.25.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.23.2` to `1.21.0` you'd simply deploy the following 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.
 
 [source,yaml]
 ----

diff --git a/docs/modules/nifi/partials/supported-versions.adoc b/docs/modules/nifi/partials/supported-versions.adoc
@@ -2,5 +2,6 @@
 // This is a separate file, since it is used by both the direct NiFi-Operator documentation, and the overarching
 // Stackable Platform documentation.
 
-- 1.23.2
-- 1.21.0 (deprecated)
+- 1.25.0
+- 1.23.2 (deprecated)
+- 1.21.0 (LTS)
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.8.3
+    productVersion: 3.9.1
   servers:
     roleGroups:
       default:
@@ -47,7 +47,7 @@ metadata:
   name: simple-nifi
 spec:
   image:
-    productVersion: 1.23.2
+    productVersion: 1.25.0
   clusterConfig:
     authentication:
       - authenticationClass: simple-nifi-admin-user

diff --git a/rust/operator-binary/src/config.rs b/rust/operator-binary/src/config.rs
@@ -21,8 +21,8 @@ use stackable_operator::{
 use strum::{Display, EnumIter};
 
 use crate::{
-    authentication::{STACKABLE_SERVER_TLS_DIR, STACKABLE_TLS_STORE_PASSWORD},
     operations::graceful_shutdown::graceful_shutdown_config_properties,
+    security::authentication::{STACKABLE_SERVER_TLS_DIR, STACKABLE_TLS_STORE_PASSWORD},
 };
 
 pub const NIFI_CONFIG_DIRECTORY: &str = "/stackable/nifi/conf";