replace nifi 2.0.0-M4 with 2.0.0

CHANGELOG.md

@@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file.
   - `affinity`
   - `extraVolumes`
 - Increase `log` Volume size from 33 MiB to 500 MiB ([#671]).
+- Replaced experimental NiFi `2.0.0-M4` with `2.0.0` ([#xxx]).
 
 ### Fixed
 
@@ -44,6 +45,7 @@ All notable changes to this project will be documented in this file.
 [#690]: https://github.com/stackabletech/nifi-operator/pull/690
 [#694]: https://github.com/stackabletech/nifi-operator/pull/694
 [#698]: https://github.com/stackabletech/nifi-operator/pull/698
+[#xxx]: https://github.com/stackabletech/nifi-operator/pull/xxx
 
 ## [24.7.0] - 2024-07-24
 

docs/modules/nifi/pages/usage_guide/updating.adoc

@@ -2,7 +2,7 @@
 :description: Easily update or downgrade Apache NiFi on Kubernetes by changing the CRD version.
 
 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.27.0` to `2.0.0-M4` you'd simply deploy the following CRD.
+Continuing the example above, to change the deployed version from `1.27.0` to `2.0.0` you'd simply deploy the following CRD.
 
 [source,yaml]
 ----
@@ -12,7 +12,7 @@ metadata:
   name: simple-nifi
 spec:
   image:
-    productVersion: 2.0.0-M4 # <1>
+    productVersion: 2.0.0 # <1>
 ----
 
 <1> Change the NiFi version here
@@ -21,6 +21,6 @@ WARNING: NiFi clusters cannot be upgraded or downgraded in a rolling fashion due
 Any change to the NiFi version in the CRD triggers a full cluster restart with brief downtime.
 However, the Stackable image version can be updated in a rolling manner, provided the NiFi version remains unchanged.
 
-== NiFi 2.0.0-M4
+== NiFi 2.0.0
 
-Before you can upgrade to `2.0.0-M4` you https://cwiki.apache.org/confluence/display/NIFI/Migration+Guidance[need to update] to at least version 1.27.x!
+Before you can upgrade to `2.0.0` you https://cwiki.apache.org/confluence/display/NIFI/Migration+Guidance[need to update] to at least version 1.27.x!

docs/modules/nifi/partials/supported-versions.adoc

@@ -2,7 +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) - Please note that you need to upgrade to at least 1.27.x before upgrading to 2.0.x!
+* 2.0.0 (experimental) - Please note that you need to upgrade to at least 1.27.x before upgrading to 2.0.x!
 * 1.27.0 (LTS)
 
 For details on how to upgrade your NiFi version, refer to xref:nifi:usage_guide/updating.adoc[].

examples/simple-nifi-cluster.yaml

@@ -47,7 +47,7 @@ metadata:
   name: simple-nifi
 spec:
   image:
-    productVersion: 1.27.0
+    productVersion: 2.0.0
   clusterConfig:
     authentication:
       - authenticationClass: simple-nifi-admin-user
@@ -60,4 +60,4 @@ spec:
     config:
     roleGroups:
       default:
-        replicas: 2
+        replicas: 1

tests/templates/kuttl/oidc/login.py

@@ -27,7 +27,7 @@
 # startswith instead of an exact check to
 # a) hit all 2.x versions and
 # b) to allow for custom images because `nifi_version` will contain the whole custom image string
-# e.g. 2.0.0-M4,localhost:5000/stackable/nifi:2.0.0-M4-stackable0.0.0-dev
+# e.g. 2.0.0,localhost:5000/stackable/nifi:2.0.0-stackable0.0.0-dev
 if not nifi_version.startswith("1."):
     auth_config_page = session.get(
         f"https://{nifi}:8443/nifi-api/authentication/configuration",

tests/test-definition.yaml

@@ -9,7 +9,7 @@ dimensions:
   - name: nifi
     values:
       - 1.27.0
-      - 2.0.0-M4
+      - 2.0.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.27.0,docker.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev
@@ -18,13 +18,13 @@ dimensions:
       - 1.27.0
   - name: nifi_new
     values:
-      - 2.0.0-M4
+      - 2.0.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.27.0,docker.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev
   - name: nifi-latest
     values:
-      - 2.0.0-M4
+      - 2.0.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.27.0,docker.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev