From 82641be3854e2bcb47dfdd440cfecf7c7094ba1d Mon Sep 17 00:00:00 2001 From: maltesander Date: Wed, 6 Nov 2024 11:13:23 +0100 Subject: [PATCH 1/3] replace nifi 2.0.0-M4 with 2.0.0 --- CHANGELOG.md | 2 ++ docs/modules/nifi/pages/usage_guide/updating.adoc | 8 ++++---- docs/modules/nifi/partials/supported-versions.adoc | 2 +- examples/simple-nifi-cluster.yaml | 4 ++-- tests/templates/kuttl/oidc/login.py | 2 +- tests/test-definition.yaml | 6 +++--- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8df59250..5befbd63 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/docs/modules/nifi/pages/usage_guide/updating.adoc b/docs/modules/nifi/pages/usage_guide/updating.adoc index bbb60480..9cb7c478 100644 --- a/docs/modules/nifi/pages/usage_guide/updating.adoc +++ b/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! diff --git a/docs/modules/nifi/partials/supported-versions.adoc b/docs/modules/nifi/partials/supported-versions.adoc index 2ae0b7e2..a6db2e48 100644 --- a/docs/modules/nifi/partials/supported-versions.adoc +++ b/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[]. diff --git a/examples/simple-nifi-cluster.yaml b/examples/simple-nifi-cluster.yaml index 22bbdc35..873a39ea 100644 --- a/examples/simple-nifi-cluster.yaml +++ b/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 diff --git a/tests/templates/kuttl/oidc/login.py b/tests/templates/kuttl/oidc/login.py index 7fcb7356..4961c5fe 100644 --- a/tests/templates/kuttl/oidc/login.py +++ b/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", diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 8769e8a1..0df3ef95 100644 --- a/tests/test-definition.yaml +++ b/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 From 96af2d85869acff7cfa577b11c0a2a034e607c08 Mon Sep 17 00:00:00 2001 From: maltesander Date: Wed, 6 Nov 2024 11:15:08 +0100 Subject: [PATCH 2/3] adapted changelog --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5befbd63..5de1c31c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,7 +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]). +- Replaced experimental NiFi `2.0.0-M4` with `2.0.0` ([#702]). ### Fixed @@ -45,7 +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 +[#702]: https://github.com/stackabletech/nifi-operator/pull/702 ## [24.7.0] - 2024-07-24 From e2aa48d4e94a5f229f18a3142ef283a6cd2db866 Mon Sep 17 00:00:00 2001 From: maltesander Date: Wed, 6 Nov 2024 17:11:03 +0100 Subject: [PATCH 3/3] use 1.27.0 lts instead of experimental --- examples/simple-nifi-cluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/simple-nifi-cluster.yaml b/examples/simple-nifi-cluster.yaml index 873a39ea..f2eb6b50 100644 --- a/examples/simple-nifi-cluster.yaml +++ b/examples/simple-nifi-cluster.yaml @@ -47,7 +47,7 @@ metadata: name: simple-nifi spec: image: - productVersion: 2.0.0 + productVersion: 1.27.0 clusterConfig: authentication: - authenticationClass: simple-nifi-admin-user