From 5a38fc5335cf28ffb37b415e3968318cc4a8e4a3 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 1 Oct 2025 15:01:06 +0200 Subject: [PATCH 1/6] test: Use trino-cli command --- tests/templates/kuttl/iceberg/40-create-iceberg-tables.j2 | 2 +- tests/templates/kuttl/iceberg/70-check-iceberg-tables.yaml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/templates/kuttl/iceberg/40-create-iceberg-tables.j2 b/tests/templates/kuttl/iceberg/40-create-iceberg-tables.j2 index 7958931a..2f3d28ad 100644 --- a/tests/templates/kuttl/iceberg/40-create-iceberg-tables.j2 +++ b/tests/templates/kuttl/iceberg/40-create-iceberg-tables.j2 @@ -15,7 +15,7 @@ spec: - pipefail - -c - | - cat << 'EOF' | java -jar trino-cli-*-executable.jar --server https://trino-coordinator:8443 --insecure --user admin + cat << 'EOF' | ./trino-cli --server https://trino-coordinator:8443 --insecure --user admin CREATE SCHEMA IF NOT EXISTS iceberg.s3 WITH (location = 's3a://demo/lakehouse/s3'); CREATE TABLE IF NOT EXISTS iceberg.s3.greetings (hello varchar); CREATE SCHEMA IF NOT EXISTS iceberg.hdfs WITH (location = 'hdfs:/lakehouse/hdfs'); diff --git a/tests/templates/kuttl/iceberg/70-check-iceberg-tables.yaml.j2 b/tests/templates/kuttl/iceberg/70-check-iceberg-tables.yaml.j2 index 079a2722..c4ce0cb1 100644 --- a/tests/templates/kuttl/iceberg/70-check-iceberg-tables.yaml.j2 +++ b/tests/templates/kuttl/iceberg/70-check-iceberg-tables.yaml.j2 @@ -16,7 +16,7 @@ spec: - -c - | for SCHEMA in iceberg.s3 iceberg.hdfs; do - COUNT=$(cat << EOF | java -jar trino-cli-*-executable.jar --server https://trino-coordinator:8443 --insecure --user admin + COUNT=$(cat << EOF | ./trino-cli --server https://trino-coordinator:8443 --insecure --user admin SELECT COUNT(*) FROM $SCHEMA.greetings WHERE hello = 'world from NiFi :)'; EOF ) From fa5d9ff6ff3164e25d50f9e250ce8bd56f69d372 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 1 Oct 2025 15:29:28 +0200 Subject: [PATCH 2/6] docs: Update supported versions --- docs/modules/nifi/partials/supported-versions.adoc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/modules/nifi/partials/supported-versions.adoc b/docs/modules/nifi/partials/supported-versions.adoc index f9d44aed..ac5437d5 100644 --- a/docs/modules/nifi/partials/supported-versions.adoc +++ b/docs/modules/nifi/partials/supported-versions.adoc @@ -2,8 +2,9 @@ // This is a separate file, since it is used by both the direct NiFi-Operator documentation, and the overarching // Stackable Platform documentation. -* 2.4.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) +* 2.6.0 (LTS, Please note that you need to upgrade to at least 1.27.x before upgrading to 2.x.x!) +* 2.4.0 (Deprecated, Please note that you need to upgrade to at least 1.27.x before upgrading to 2.x.x!) +* 1.28.1 (Deprecated) +* 1.27.0 (Deprecated) For details on how to upgrade your NiFi version, refer to xref:nifi:usage_guide/updating.adoc[]. From 4c1422560000f2daf667a4fda43ed857dc539dce Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 1 Oct 2025 15:29:52 +0200 Subject: [PATCH 3/6] test: Add NiFi 2.6.0 --- tests/test-definition.yaml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 83984350..c18a2196 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -5,23 +5,24 @@ dimensions: - 1.27.0 - 1.28.1 - 2.4.0 + - 2.6.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. - # - 2.4.0,oci.stackable.tech/sandbox/nifi:2.4.0-stackable0.0.0-dev + # - 2.6.0,oci.stackable.tech/sandbox/nifi:2.6.0-stackable0.0.0-dev - name: nifi_old values: - 1.27.0 - name: nifi_new values: - - 2.4.0 # oci.stackable.tech/sandbox/nifi:2.4.0-stackable0.0.0-dev + - 2.6.0 # oci.stackable.tech/sandbox/nifi:2.6.0-stackable0.0.0-dev - name: nifi-latest values: - - 2.4.0 # oci.stackable.tech/sandbox/nifi:2.4.0-stackable0.0.0-dev + - 2.6.0 # oci.stackable.tech/sandbox/nifi:2.6.0-stackable0.0.0-dev - name: nifi-iceberg # Not all NiFi versions support Iceberg with the same functionality! # E.g. our own implementation started with NiFi 2.2.0 values: - - 2.4.0 # oci.stackable.tech/sandbox/nifi:2.4.0-stackable0.0.0-dev + - 2.6.0 # oci.stackable.tech/sandbox/nifi:2.6.0-stackable0.0.0-dev # TODO: Can be removed once NiFi 1.x.x is removed - only for seperate smoke tests - name: nifi-v1 values: @@ -31,6 +32,7 @@ dimensions: - name: nifi-v2 values: - 2.4.0 + - 2.6.0 # Use Kubernetes manager if set to false - name: use-zookeeper-manager values: From b5cc7cec901d83ceca2a4450df73891b7e5a6067 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Thu, 2 Oct 2025 14:02:59 +0200 Subject: [PATCH 4/6] test(iceberg): Allow for slower queries --- tests/templates/kuttl/iceberg/34_trino.yaml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/templates/kuttl/iceberg/34_trino.yaml.j2 b/tests/templates/kuttl/iceberg/34_trino.yaml.j2 index 9d8b5415..6c7b1992 100644 --- a/tests/templates/kuttl/iceberg/34_trino.yaml.j2 +++ b/tests/templates/kuttl/iceberg/34_trino.yaml.j2 @@ -61,7 +61,7 @@ spec: replicas: 1 workers: config: - gracefulShutdownTimeout: 60s # Let the test run faster + gracefulShutdownTimeout: 120s # Let the test run faster, but allow for slow queries logging: enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} {% if test_scenario['values']['iceberg-use-kerberos'] == 'true' %} From 321b8d86525e508856a63673ffadb33568369130 Mon Sep 17 00:00:00 2001 From: xeniape Date: Thu, 9 Oct 2025 15:37:50 +0200 Subject: [PATCH 5/6] bump nifi versions --- docs/modules/nifi/examples/getting_started/getting_started.sh | 2 +- .../modules/nifi/examples/getting_started/getting_started.sh.j2 | 2 +- examples/simple-nifi-cluster.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/modules/nifi/examples/getting_started/getting_started.sh b/docs/modules/nifi/examples/getting_started/getting_started.sh index 4c0a1c80..f26787d3 100755 --- a/docs/modules/nifi/examples/getting_started/getting_started.sh +++ b/docs/modules/nifi/examples/getting_started/getting_started.sh @@ -81,7 +81,7 @@ metadata: name: simple-nifi spec: image: - productVersion: 2.4.0 + productVersion: 2.6.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 1064169f..535512f9 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-nifi spec: image: - productVersion: 2.4.0 + productVersion: 2.6.0 clusterConfig: authentication: - authenticationClass: simple-nifi-users diff --git a/examples/simple-nifi-cluster.yaml b/examples/simple-nifi-cluster.yaml index 183941f1..838af62f 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.6.0 clusterConfig: authentication: - authenticationClass: simple-nifi-admin-user From d45ad9360bb815d86ff69bb8b339540cf8cc317f Mon Sep 17 00:00:00 2001 From: xeniape Date: Thu, 9 Oct 2025 15:52:10 +0200 Subject: [PATCH 6/6] add changelog entry --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e334130e..236f40c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ All notable changes to this project will be documented in this file. ### Added - Helm: Allow Pod `priorityClassName` to be configured ([#840]). +- Add support for `2.6.0` ([#849]). + +### Changed + +- Deprecate support for `1.27.0`, `1.28.1`, and `2.4.0` ([#849]). ### Fixed @@ -18,6 +23,7 @@ All notable changes to this project will be documented in this file. [#840]: https://github.com/stackabletech/nifi-operator/pull/840 [#844]: https://github.com/stackabletech/nifi-operator/pull/844 +[#849]: https://github.com/stackabletech/nifi-operator/pull/849 ## [25.7.0] - 2025-07-23