Skip to content

Commit 3569e2c

Browse files
chore: Bump to 2.6.0 (#849)
* test: Use trino-cli command * docs: Update supported versions * test: Add NiFi 2.6.0 * test(iceberg): Allow for slower queries * bump nifi versions * add changelog entry --------- Co-authored-by: xeniape <[email protected]>
1 parent 06f365c commit 3569e2c

File tree

7 files changed

+20
-11
lines changed

7 files changed

+20
-11
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ All notable changes to this project will be documented in this file.
77
### Added
88

99
- Helm: Allow Pod `priorityClassName` to be configured ([#840]).
10+
- Add support for `2.6.0` ([#849]).
11+
12+
### Changed
13+
14+
- Deprecate support for `1.27.0`, `1.28.1`, and `2.4.0` ([#849]).
1015

1116
### Fixed
1217

@@ -18,6 +23,7 @@ All notable changes to this project will be documented in this file.
1823

1924
[#840]: https://github.com/stackabletech/nifi-operator/pull/840
2025
[#844]: https://github.com/stackabletech/nifi-operator/pull/844
26+
[#849]: https://github.com/stackabletech/nifi-operator/pull/849
2127

2228
## [25.7.0] - 2025-07-23
2329

docs/modules/nifi/examples/getting_started/getting_started.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ metadata:
8181
name: simple-nifi
8282
spec:
8383
image:
84-
productVersion: 2.4.0
84+
productVersion: 2.6.0
8585
clusterConfig:
8686
authentication:
8787
- authenticationClass: simple-nifi-users

docs/modules/nifi/examples/getting_started/getting_started.sh.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ metadata:
8181
name: simple-nifi
8282
spec:
8383
image:
84-
productVersion: 2.4.0
84+
productVersion: 2.6.0
8585
clusterConfig:
8686
authentication:
8787
- authenticationClass: simple-nifi-users

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
// This is a separate file, since it is used by both the direct NiFi-Operator documentation, and the overarching
33
// Stackable Platform documentation.
44

5-
* 2.4.0 (Please note that you need to upgrade to at least 1.27.x before upgrading to 2.x.x!)
6-
* 1.28.1
7-
* 1.27.0 (LTS)
5+
* 2.6.0 (LTS, Please note that you need to upgrade to at least 1.27.x before upgrading to 2.x.x!)
6+
* 2.4.0 (Deprecated, Please note that you need to upgrade to at least 1.27.x before upgrading to 2.x.x!)
7+
* 1.28.1 (Deprecated)
8+
* 1.27.0 (Deprecated)
89
910
For details on how to upgrade your NiFi version, refer to xref:nifi:usage_guide/updating.adoc[].

examples/simple-nifi-cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ metadata:
4747
name: simple-nifi
4848
spec:
4949
image:
50-
productVersion: 1.27.0
50+
productVersion: 2.6.0
5151
clusterConfig:
5252
authentication:
5353
- authenticationClass: simple-nifi-admin-user

tests/templates/kuttl/iceberg/34_trino.yaml.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ spec:
6161
replicas: 1
6262
workers:
6363
config:
64-
gracefulShutdownTimeout: 60s # Let the test run faster
64+
gracefulShutdownTimeout: 120s # Let the test run faster, but allow for slow queries
6565
logging:
6666
enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }}
6767
{% if test_scenario['values']['iceberg-use-kerberos'] == 'true' %}

tests/test-definition.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,24 @@ dimensions:
55
- 1.27.0
66
- 1.28.1
77
- 2.4.0
8+
- 2.6.0
89
# Alternatively, if you want to use a custom image, append a comma and the full image name to the product version
910
# as in the example below.
10-
# - 2.4.0,oci.stackable.tech/sandbox/nifi:2.4.0-stackable0.0.0-dev
11+
# - 2.6.0,oci.stackable.tech/sandbox/nifi:2.6.0-stackable0.0.0-dev
1112
- name: nifi_old
1213
values:
1314
- 1.27.0
1415
- name: nifi_new
1516
values:
16-
- 2.4.0 # oci.stackable.tech/sandbox/nifi:2.4.0-stackable0.0.0-dev
17+
- 2.6.0 # oci.stackable.tech/sandbox/nifi:2.6.0-stackable0.0.0-dev
1718
- name: nifi-latest
1819
values:
19-
- 2.4.0 # oci.stackable.tech/sandbox/nifi:2.4.0-stackable0.0.0-dev
20+
- 2.6.0 # oci.stackable.tech/sandbox/nifi:2.6.0-stackable0.0.0-dev
2021
- name: nifi-iceberg
2122
# Not all NiFi versions support Iceberg with the same functionality!
2223
# E.g. our own implementation started with NiFi 2.2.0
2324
values:
24-
- 2.4.0 # oci.stackable.tech/sandbox/nifi:2.4.0-stackable0.0.0-dev
25+
- 2.6.0 # oci.stackable.tech/sandbox/nifi:2.6.0-stackable0.0.0-dev
2526
# TODO: Can be removed once NiFi 1.x.x is removed - only for seperate smoke tests
2627
- name: nifi-v1
2728
values:
@@ -31,6 +32,7 @@ dimensions:
3132
- name: nifi-v2
3233
values:
3334
- 2.4.0
35+
- 2.6.0
3436
# Use Kubernetes manager if set to false
3537
- name: use-zookeeper-manager
3638
values:

0 commit comments

Comments
 (0)