From 0a2d180cbcdd1976aa1249f0ba6bfe7d22cda07c Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 5 Jul 2024 09:20:20 +0200 Subject: [PATCH 1/7] bump versions --- .../examples/getting_started/getting_started.sh | 2 +- .../getting_started/getting_started.sh.j2 | 4 ++-- .../pages/usage_guide/custom_processors.adoc | 8 ++++---- docs/modules/nifi/pages/usage_guide/index.adoc | 2 +- .../nifi/pages/usage_guide/updating.adoc | 4 ++-- .../nifi/partials/supported-versions.adoc | 5 +++-- examples/simple-nifi-cluster.yaml | 4 ++-- tests/test-definition.yaml | 17 +++++++++-------- 8 files changed, 24 insertions(+), 22 deletions(-) diff --git a/docs/modules/nifi/examples/getting_started/getting_started.sh b/docs/modules/nifi/examples/getting_started/getting_started.sh index b4c9b64e..4b50579a 100755 --- 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.26.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 index b4a5d298..ba5f6d75 100755 --- 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.26.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 index 0becb813..4d76c58a 100644 --- 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.26.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.26.0 + custom: "docker.company.org/nifi:1.26.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.26.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 index 3b02b549..ebc2c7a7 100644 --- 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.26.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 index 9b901c57..54d40588 100644 --- 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.26.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 index 803308bf..deb678c4 100644 --- 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.26.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 index 85644c49..021c6477 100644 --- 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.26.0 clusterConfig: authentication: - authenticationClass: simple-nifi-admin-user diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index db38cdbe..fb7c06fe 100644 --- 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.26.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.26.0,docker.stackable.tech/sandbox/nifi:1.26.0-stackable0.0.0-dev - name: nifi_old values: - - 1.21.0 + - 1.25.0 - name: nifi_new values: - - 1.25.0 + - 1.26.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.26.0,docker.stackable.tech/sandbox/nifi:1.26.0-stackable0.0.0-dev - name: nifi-latest values: - - 1.25.0 + - 1.26.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.26.0,docker.stackable.tech/sandbox/nifi:1.26.0-stackable0.0.0-dev - name: ldap-use-tls values: - "false" From d8c6224b1db7721f0e71a06565d77d1d3d1d0c63 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 5 Jul 2024 12:17:55 +0200 Subject: [PATCH 2/7] use lowercase in reporting task name --- rust/operator-binary/src/reporting_task/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/operator-binary/src/reporting_task/mod.rs b/rust/operator-binary/src/reporting_task/mod.rs index 0657c179..28b3eb41 100644 --- 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(); From b883bbfef9ca07c829be566daa64164d58dc7b60 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 5 Jul 2024 12:18:17 +0200 Subject: [PATCH 3/7] bump version in affinity test --- rust/crd/src/affinity.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs index 5dadcd06..60ef21d0 100644 --- 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.26.0 clusterConfig: authentication: - authenticationClass: nifi-admin-credentials-simple From 0e83f3b760f582d2cc74d5648861607eee483370 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 5 Jul 2024 12:21:54 +0200 Subject: [PATCH 4/7] fix linter --- tests/test-definition.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index fb7c06fe..2b4e673d 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -15,7 +15,7 @@ dimensions: - 1.21.0 - 1.25.0 - 1.26.0 - - 2.0.0-M4 + - 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.26.0,docker.stackable.tech/sandbox/nifi:1.26.0-stackable0.0.0-dev From 5574f7ba4ce81de083181c1eedb256bb4386e6cc Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 5 Jul 2024 12:34:49 +0200 Subject: [PATCH 5/7] adapted changelog --- CHANGELOG.md | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88dd14d3..7d13fdbb 100644 --- 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.26.0 and 2.0.0-M4 ([#639]). ### Changed @@ -21,11 +17,18 @@ All notable changes to this project will be documented in this file. - Processing of corrupted log events fixed; If errors occur, the error messages are added to the log event ([#628]). +- 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]). + +### 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 ## [24.3.0] - 2024-03-20 From 280ec7ea6120687fd287884508bc1c7578686b32 Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Fri, 5 Jul 2024 12:35:38 +0200 Subject: [PATCH 6/7] fix order --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d13fdbb..f9f1a6a5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,10 +15,10 @@ 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]). -- 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]). ### Removed From de8a19569b643521c9e7c2a04a459ed294ea33cd Mon Sep 17 00:00:00 2001 From: Malte Sander Date: Mon, 8 Jul 2024 18:26:43 +0200 Subject: [PATCH 7/7] bump 1.26.0 to 1.27.0 --- CHANGELOG.md | 4 ++-- .../nifi/examples/getting_started/getting_started.sh | 2 +- .../examples/getting_started/getting_started.sh.j2 | 2 +- .../nifi/pages/usage_guide/custom_processors.adoc | 8 ++++---- docs/modules/nifi/pages/usage_guide/index.adoc | 2 +- docs/modules/nifi/pages/usage_guide/updating.adoc | 2 +- docs/modules/nifi/partials/supported-versions.adoc | 2 +- examples/simple-nifi-cluster.yaml | 2 +- rust/crd/src/affinity.rs | 2 +- tests/test-definition.yaml | 12 ++++++------ 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9f1a6a5..21aa7964 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ All notable changes to this project will be documented in this file. ### Added - Support specifying the SecretClass that is used to obtain TLS certificates ([#622]). -- Support for NiFi 1.26.0 and 2.0.0-M4 ([#639]). +- Support for NiFi `1.27.0` and `2.0.0-M4` ([#639]). ### Changed @@ -22,7 +22,7 @@ All notable changes to this project will be documented in this file. ### Removed -- Removed support for 1.23.2 ([#639]). +- 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 diff --git a/docs/modules/nifi/examples/getting_started/getting_started.sh b/docs/modules/nifi/examples/getting_started/getting_started.sh index 4b50579a..35923a1a 100755 --- 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.26.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 index ba5f6d75..218b4e6a 100755 --- 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.26.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 index 4d76c58a..dda6c45a 100644 --- 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.26.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.26.0 - custom: "docker.company.org/nifi:1.26.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.26.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 index ebc2c7a7..5d004f7c 100644 --- 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.26.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 index 54d40588..333e660d 100644 --- 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.26.0` to `1.25.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] ---- diff --git a/docs/modules/nifi/partials/supported-versions.adoc b/docs/modules/nifi/partials/supported-versions.adoc index deb678c4..c3f0b6eb 100644 --- a/docs/modules/nifi/partials/supported-versions.adoc +++ b/docs/modules/nifi/partials/supported-versions.adoc @@ -3,6 +3,6 @@ // Stackable Platform documentation. - 2.0.0-M4 (experimental) -- 1.26.0 (LTS) +- 1.27.0 (LTS) - 1.25.0 - 1.21.0 (deprecated) diff --git a/examples/simple-nifi-cluster.yaml b/examples/simple-nifi-cluster.yaml index 021c6477..22bbdc35 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.26.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 index 60ef21d0..4c07af1e 100644 --- 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.26.0 + productVersion: 1.27.0 clusterConfig: authentication: - authenticationClass: nifi-admin-credentials-simple diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 2b4e673d..83c0d4a2 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -14,26 +14,26 @@ dimensions: values: - 1.21.0 - 1.25.0 - - 1.26.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.26.0,docker.stackable.tech/sandbox/nifi:1.26.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.25.0 - name: nifi_new values: - - 1.26.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.26.0,docker.stackable.tech/sandbox/nifi:1.26.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.26.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.26.0,docker.stackable.tech/sandbox/nifi:1.26.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"