diff --git a/CHANGELOG.md b/CHANGELOG.md index 62d3788d..60d022c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file. - Support objectOverrides using `.spec.objectOverrides`. See [objectOverrides concepts page](https://docs.stackable.tech/home/nightly/concepts/overrides/#object-overrides) for details ([#927]). +- Added experimental support for `4.1.1` ([#929]) ### Changed @@ -18,12 +19,14 @@ All notable changes to this project will be documented in this file. - Refactor: remove unused RBAC cluster role ([#914]). - Refactor: remove superfluous and partly misconfigured Kafka listeners CLIENT_AUTH and CONTROLLER_AUTH ([#915]). +- Remove support for `3.7.2` and `4.1.0` ([#929]) [#911]: https://github.com/stackabletech/kafka-operator/pull/911 [#914]: https://github.com/stackabletech/kafka-operator/pull/914 [#915]: https://github.com/stackabletech/kafka-operator/pull/915 [#925]: https://github.com/stackabletech/kafka-operator/pull/925 [#927]: https://github.com/stackabletech/kafka-operator/pull/927 +[#929]: https://github.com/stackabletech/kafka-operator/pull/929 ## [25.11.0] - 2025-11-07 diff --git a/docs/modules/kafka/partials/supported-versions.adoc b/docs/modules/kafka/partials/supported-versions.adoc index e3e91193..60b4db7b 100644 --- a/docs/modules/kafka/partials/supported-versions.adoc +++ b/docs/modules/kafka/partials/supported-versions.adoc @@ -2,9 +2,8 @@ // This is a separate file, since it is used by both the direct Kafka documentation, and the overarching // Stackable Platform documentation. -* 4.1.0 (experimental) +* 4.1.1 (experimental) * 3.9.1 (LTS) -* 3.7.2 (deprecated) Support for clusters running in Kraft mode (which includes Apache Kafka 4.x.x) is experimental because it has not been thoroughly tested in production environments yet. Migrations from older Kafka version which used Apache Zookeeper for cluster coordination to the new KRaft mode are not supported yet. @@ -13,4 +12,4 @@ Also there are some known issues such as: * Controller scaling is not reliable. * Kerberos authentication is not tested yet. -* Service exposision is not definitive. +* Service exposition is not definitive. diff --git a/tests/templates/kuttl/upgrade/01-assert.yaml.j2 b/tests/templates/kuttl/upgrade/01-assert.yaml.j2 deleted file mode 100644 index c9cfcf5c..00000000 --- a/tests/templates/kuttl/upgrade/01-assert.yaml.j2 +++ /dev/null @@ -1,12 +0,0 @@ ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -timeout: 300 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: test-zk-server-default -status: - readyReplicas: 1 - replicas: 1 diff --git a/tests/templates/kuttl/upgrade/01-install-zk.yaml.j2 b/tests/templates/kuttl/upgrade/01-install-zk.yaml.j2 deleted file mode 100644 index 5ab2c212..00000000 --- a/tests/templates/kuttl/upgrade/01-install-zk.yaml.j2 +++ /dev/null @@ -1,20 +0,0 @@ ---- -apiVersion: zookeeper.stackable.tech/v1alpha1 -kind: ZookeeperCluster -metadata: - name: test-zk -spec: - image: - productVersion: "{{ test_scenario['values']['zookeeper'] }}" - pullPolicy: IfNotPresent -{% if lookup('env', 'VECTOR_AGGREGATOR') %} - clusterConfig: - vectorAggregatorConfigMapName: vector-aggregator-discovery -{% endif %} - servers: - config: - logging: - enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} - roleGroups: - default: - replicas: 1 diff --git a/tests/templates/kuttl/upgrade/02-assert.yaml.j2 b/tests/templates/kuttl/upgrade/02-assert.yaml.j2 index 7c231d57..86bfcb11 100644 --- a/tests/templates/kuttl/upgrade/02-assert.yaml.j2 +++ b/tests/templates/kuttl/upgrade/02-assert.yaml.j2 @@ -10,3 +10,11 @@ metadata: status: readyReplicas: 1 replicas: 1 +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: test-kafka-controller-default +status: + readyReplicas: 1 + replicas: 1 diff --git a/tests/templates/kuttl/upgrade/02-install-kafka.yaml.j2 b/tests/templates/kuttl/upgrade/02-install-kafka.yaml.j2 index afd99b60..e88820f0 100644 --- a/tests/templates/kuttl/upgrade/02-install-kafka.yaml.j2 +++ b/tests/templates/kuttl/upgrade/02-install-kafka.yaml.j2 @@ -1,11 +1,3 @@ ---- -apiVersion: zookeeper.stackable.tech/v1alpha1 -kind: ZookeeperZnode -metadata: - name: test-kafka-znode -spec: - clusterRef: - name: test-zk {% if test_scenario['values']['use-client-auth-tls'] == 'true' %} --- apiVersion: authentication.stackable.tech/v1alpha1 @@ -53,7 +45,6 @@ spec: {% if lookup('env', 'VECTOR_AGGREGATOR') %} vectorAggregatorConfigMapName: vector-aggregator-discovery {% endif %} - zookeeperConfigMapName: test-zk brokers: config: gracefulShutdownTimeout: 30s # speed up tests @@ -62,3 +53,11 @@ spec: roleGroups: default: replicas: 1 + controllers: + config: + gracefulShutdownTimeout: 30s # speed up tests + logging: + enableVectorAgent: {{ lookup('env', 'VECTOR_AGGREGATOR') | length > 0 }} + roleGroups: + default: + replicas: 1 diff --git a/tests/templates/kuttl/upgrade/04-assert.yaml.j2 b/tests/templates/kuttl/upgrade/04-assert.yaml.j2 index 2a95af44..bc149a35 100644 --- a/tests/templates/kuttl/upgrade/04-assert.yaml.j2 +++ b/tests/templates/kuttl/upgrade/04-assert.yaml.j2 @@ -14,3 +14,15 @@ status: replicas: 1 currentReplicas: 1 updatedReplicas: 1 +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: test-kafka-controller-default + labels: + app.kubernetes.io/version: "{{ test_scenario['values']['upgrade_new'] }}-stackable0.0.0-dev" +status: + readyReplicas: 1 + replicas: 1 + currentReplicas: 1 + updatedReplicas: 1 diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index f31f68a2..cfe2282d 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -6,12 +6,10 @@ dimensions: - name: kafka-kraft values: - - 3.7.2 - 3.9.1 - - 4.1.0 + - 4.1.1 - name: kafka values: - - 3.7.2 - 3.9.1 # 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. @@ -24,17 +22,16 @@ dimensions: # - 3.9.1,oci.stackable.tech/sdp/kafka:3.9.1-stackable0.0.0-dev - name: zookeeper values: - - 3.9.3 - 3.9.4 - name: zookeeper-latest values: - 3.9.4 - name: upgrade_old values: - - 3.7.2 + - 3.9.1 - name: upgrade_new values: - - 3.9.1 + - 4.1.1 - name: use-client-tls values: - "true" @@ -86,9 +83,9 @@ tests: dimensions: - kafka-latest - openshift + # This tests upgrading kraft clusters only - name: upgrade dimensions: - - zookeeper - upgrade_new - upgrade_old - use-client-tls