From 8f0b6829f3446dcf47b4d53641ab71cd1405cdcd Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 19 Feb 2025 14:05:24 +0100 Subject: [PATCH 1/5] docs: Update supported versions --- docs/modules/nifi/partials/supported-versions.adoc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/modules/nifi/partials/supported-versions.adoc b/docs/modules/nifi/partials/supported-versions.adoc index a6db2e48..2bdb95fa 100644 --- a/docs/modules/nifi/partials/supported-versions.adoc +++ b/docs/modules/nifi/partials/supported-versions.adoc @@ -2,7 +2,8 @@ // 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 (experimental) - Please note that you need to upgrade to at least 1.27.x before upgrading to 2.0.x! +* 2.2.0 Please note that you need to upgrade to at least 1.27.x before upgrading to 2.x.x! +* 1.28.1 * 1.27.0 (LTS) For details on how to upgrade your NiFi version, refer to xref:nifi:usage_guide/updating.adoc[]. From 3b72d650629252819f08ecd8236adab0ecc2ab11 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 19 Feb 2025 14:07:21 +0100 Subject: [PATCH 2/5] test: Bump versions to 1.28.1 and 2.2.0 --- tests/test-definition.yaml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 9d2728c5..8f4260fd 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -1,33 +1,34 @@ --- dimensions: - - name: zookeeper - values: - - 3.9.2 - - name: zookeeper-latest - values: - - 3.9.2 - name: nifi values: - 1.27.0 - - 2.0.0 + - 1.28.1 + - 2.2.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,oci.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev + # - 2.2.0,oci.stackable.tech/sandbox/nifi:2.2.0-stackable0.0.0-dev - name: nifi_old values: - 1.27.0 - name: nifi_new values: - - 2.0.0 + - 2.2.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,oci.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev + # - 2.2.0,oci.stackable.tech/sandbox/nifi:2.2.0-stackable0.0.0-dev - name: nifi-latest values: - - 2.0.0 + - 2.2.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,oci.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev + # - 2.2.0,oci.stackable.tech/sandbox/nifi:2.2.0-stackable0.0.0-dev + - name: zookeeper + values: + - 3.9.2 + - name: zookeeper-latest + values: + - 3.9.2 - name: ldap-use-tls values: - "false" From 89d330229bd03e9dac89495b143926bc21832ebc Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 19 Feb 2025 14:08:13 +0100 Subject: [PATCH 3/5] docs(getting-started): Bump NifiCluster to 2.2.0 --- docs/modules/nifi/examples/getting_started/getting_started.sh | 3 ++- .../nifi/examples/getting_started/getting_started.sh.j2 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/modules/nifi/examples/getting_started/getting_started.sh b/docs/modules/nifi/examples/getting_started/getting_started.sh index 427513e2..e1ddb6a4 100755 --- a/docs/modules/nifi/examples/getting_started/getting_started.sh +++ b/docs/modules/nifi/examples/getting_started/getting_started.sh @@ -146,7 +146,8 @@ metadata: name: simple-nifi spec: image: - productVersion: 1.27.0 + productVersion: 2.2.0 + pullPolicy: Never 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 a7ee5671..6404ccc9 100755 --- a/docs/modules/nifi/examples/getting_started/getting_started.sh.j2 +++ b/docs/modules/nifi/examples/getting_started/getting_started.sh.j2 @@ -146,7 +146,7 @@ metadata: name: simple-nifi spec: image: - productVersion: 1.27.0 + productVersion: 2.2.0 clusterConfig: authentication: - authenticationClass: simple-nifi-users From 08f7af661043520401f44548c0ccbb70d62a3bdc Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 19 Feb 2025 14:08:53 +0100 Subject: [PATCH 4/5] fix(getting_started): follow redirects in nifi check --- docs/modules/nifi/examples/getting_started/test-nifi.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/modules/nifi/examples/getting_started/test-nifi.sh b/docs/modules/nifi/examples/getting_started/test-nifi.sh index ce872a95..95663256 100755 --- a/docs/modules/nifi/examples/getting_started/test-nifi.sh +++ b/docs/modules/nifi/examples/getting_started/test-nifi.sh @@ -10,7 +10,7 @@ nifi_password=$(kubectl get secret simple-admin-credentials -o jsonpath='{.data. # check if host is reachable echo "Checking if NiFi is reachable at $nifi_host" -return_code=$(curl --insecure -v -o /dev/null -w "%{http_code}" "$nifi_host") +return_code=$(curl --insecure --location -v -o /dev/null -w "%{http_code}" "$nifi_host") if [ "$return_code" -ne "200" ]; then echo "can't reach NiFi. return code: $return_code" From a2cc56b548619f9a5a83f2dad67b11d665cd81fd Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Thu, 20 Feb 2025 14:43:14 +0100 Subject: [PATCH 5/5] fix(getting_started): Remove accidental PullPolicy used in local testing --- docs/modules/nifi/examples/getting_started/getting_started.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/modules/nifi/examples/getting_started/getting_started.sh b/docs/modules/nifi/examples/getting_started/getting_started.sh index e1ddb6a4..9e1b9c8d 100755 --- a/docs/modules/nifi/examples/getting_started/getting_started.sh +++ b/docs/modules/nifi/examples/getting_started/getting_started.sh @@ -147,7 +147,6 @@ metadata: spec: image: productVersion: 2.2.0 - pullPolicy: Never clusterConfig: authentication: - authenticationClass: simple-nifi-users