From 5388aeb5a761897f0daf17e3e50548f734070df5 Mon Sep 17 00:00:00 2001 From: Ryanne Dolan Date: Tue, 28 Apr 2026 17:53:45 -0500 Subject: [PATCH 1/2] Update Strimzi API from v1beta2 to v1 and pin to 1.0.0 Strimzi 1.0.0 dropped the v1beta2 API for KafkaTopic in favor of v1. Since the Makefile pulled strimzi.io/install/latest, CI broke when 1.0.0 was released. This updates all references from kafka.strimzi.io/v1beta2 to kafka.strimzi.io/v1 and pins the Makefile to strimzi 1.0.0 to prevent future surprise breakages. Co-Authored-By: Claude Opus 4.6 (1M context) --- Makefile | 4 ++-- deploy/dev/kafka.yaml | 6 +++--- deploy/samples/kafkadb.yaml | 6 +++--- docs/getting-started/concepts.md | 2 +- docs/kubernetes/crd-reference.md | 2 +- docs/kubernetes/templates.md | 2 +- .../k8s/status/K8sPipelineElementStatusEstimatorTest.java | 2 +- hoptimator-kafka/src/test/resources/kafka-ddl-beam.id | 4 ++-- .../src/test/resources/kafka-ddl-create-table.id | 6 +++--- hoptimator-kafka/src/test/resources/kafka-ddl.id | 4 ++-- hoptimator-logical/src/test/resources/logical-ddl.id | 2 +- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Makefile b/Makefile index bc1d3dd3..8a3a1f12 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ undeploy-flink: deploy-kafka: deploy deploy-flink kubectl create namespace kafka || echo "skipping" - kubectl apply -f "https://strimzi.io/install/latest?namespace=kafka" -n kafka + curl -sL "https://github.com/strimzi/strimzi-kafka-operator/releases/download/1.0.0/strimzi-cluster-operator-1.0.0.yaml" | sed 's/namespace: myproject/namespace: kafka/g' | kubectl apply -f - -n kafka sleep 10 # avoid kubectl race condition kubectl wait --for=condition=Established=True crds/kafkas.kafka.strimzi.io kubectl apply -f ./deploy/samples/kafkadb.yaml @@ -89,7 +89,7 @@ undeploy-kafka: kubectl delete kafkatopic.kafka.strimzi.io --all || echo "skipping" kubectl delete strimzi -n kafka --all || echo "skipping" kubectl delete pvc -l strimzi.io/name=one-kafka -n kafka || echo "skipping" - kubectl delete -f "https://strimzi.io/install/latest?namespace=kafka" -n kafka || echo "skipping" + curl -sL "https://github.com/strimzi/strimzi-kafka-operator/releases/download/1.0.0/strimzi-cluster-operator-1.0.0.yaml" | sed 's/namespace: myproject/namespace: kafka/g' | kubectl delete -f - -n kafka || echo "skipping" kubectl delete -f ./deploy/samples/kafkadb.yaml || echo "skipping" kubectl delete namespace kafka || echo "skipping" diff --git a/deploy/dev/kafka.yaml b/deploy/dev/kafka.yaml index b01bd49b..8a7ce128 100644 --- a/deploy/dev/kafka.yaml +++ b/deploy/dev/kafka.yaml @@ -15,7 +15,7 @@ # Based on examples at: # https://github.com/strimzi/strimzi-kafka-operator/blob/main/examples/kafka -apiVersion: kafka.strimzi.io/v1beta2 +apiVersion: kafka.strimzi.io/v1 kind: KafkaNodePool metadata: name: controller @@ -34,7 +34,7 @@ spec: kraftMetadata: shared --- -apiVersion: kafka.strimzi.io/v1beta2 +apiVersion: kafka.strimzi.io/v1 kind: KafkaNodePool metadata: name: broker @@ -53,7 +53,7 @@ spec: kraftMetadata: shared --- -apiVersion: kafka.strimzi.io/v1beta2 +apiVersion: kafka.strimzi.io/v1 kind: Kafka metadata: name: one diff --git a/deploy/samples/kafkadb.yaml b/deploy/samples/kafkadb.yaml index 58bb3a3b..328f68f8 100644 --- a/deploy/samples/kafkadb.yaml +++ b/deploy/samples/kafkadb.yaml @@ -17,7 +17,7 @@ spec: databases: - kafka-database yaml: | - apiVersion: kafka.strimzi.io/v1beta2 + apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: {{name}} @@ -42,7 +42,7 @@ spec: --- -apiVersion: kafka.strimzi.io/v1beta2 +apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: kafka-database-existing-topic-1 @@ -58,7 +58,7 @@ spec: --- -apiVersion: kafka.strimzi.io/v1beta2 +apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: kafka-database-existing-topic-2 diff --git a/docs/getting-started/concepts.md b/docs/getting-started/concepts.md index 1074460e..c5dcca8b 100644 --- a/docs/getting-started/concepts.md +++ b/docs/getting-started/concepts.md @@ -175,7 +175,7 @@ spec: databases: - kafka-database yaml: | - apiVersion: kafka.strimzi.io/v1beta2 + apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: {{name}} diff --git a/docs/kubernetes/crd-reference.md b/docs/kubernetes/crd-reference.md index c6afe01f..a6452f9f 100644 --- a/docs/kubernetes/crd-reference.md +++ b/docs/kubernetes/crd-reference.md @@ -168,7 +168,7 @@ spec: methods: - Scan yaml: | - apiVersion: kafka.strimzi.io/v1beta2 + apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: {{name}} diff --git a/docs/kubernetes/templates.md b/docs/kubernetes/templates.md index b791454e..b99d9d52 100644 --- a/docs/kubernetes/templates.md +++ b/docs/kubernetes/templates.md @@ -50,7 +50,7 @@ spec: databases: [ kafka-database ] methods: [ Scan, Modify ] yaml: | - apiVersion: kafka.strimzi.io/v1beta2 + apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: {{name}} diff --git a/hoptimator-k8s/src/test/java/com/linkedin/hoptimator/k8s/status/K8sPipelineElementStatusEstimatorTest.java b/hoptimator-k8s/src/test/java/com/linkedin/hoptimator/k8s/status/K8sPipelineElementStatusEstimatorTest.java index 08870eb5..6b42a63c 100644 --- a/hoptimator-k8s/src/test/java/com/linkedin/hoptimator/k8s/status/K8sPipelineElementStatusEstimatorTest.java +++ b/hoptimator-k8s/src/test/java/com/linkedin/hoptimator/k8s/status/K8sPipelineElementStatusEstimatorTest.java @@ -65,7 +65,7 @@ public class K8sPipelineElementStatusEstimatorTest { "apiVersion: foo.org/v1beta1\n" + "kind: FakeJob\n" + "metadata:\n" + " name: fake-job-name\n" + "spec:\n" + " deploymentName: fake-deployment\n" + " job:\n" + " entryClass: com.runner.FakeRunner"; private static final String FAKE_KAFKA_TOPIC_SPEC = - "apiVersion: kafka.strimzi.io/v1beta2\n" + "kind: KafkaTopic\n" + "metadata:\n" + " name: fake-kafka-topic\n" + "apiVersion: kafka.strimzi.io/v1\n" + "kind: KafkaTopic\n" + "metadata:\n" + " name: fake-kafka-topic\n" + " labels:\n" + " strimzi.io/cluster: one\n" + "spec:\n" + " topicName: existing-topic-1\n" + " partitions: 1"; diff --git a/hoptimator-kafka/src/test/resources/kafka-ddl-beam.id b/hoptimator-kafka/src/test/resources/kafka-ddl-beam.id index 96833130..ec5ccf6f 100644 --- a/hoptimator-kafka/src/test/resources/kafka-ddl-beam.id +++ b/hoptimator-kafka/src/test/resources/kafka-ddl-beam.id @@ -22,7 +22,7 @@ spec: flink.app.type: 'BEAM' flink.app.name: 'hoptimator-flink-runner' --- -apiVersion: kafka.strimzi.io/v1beta2 +apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: kafka-database-existing-topic-1 @@ -36,7 +36,7 @@ spec: retention.ms: 7200000 segment.bytes: 1073741824 --- -apiVersion: kafka.strimzi.io/v1beta2 +apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: kafka-database-existing-topic-2 diff --git a/hoptimator-kafka/src/test/resources/kafka-ddl-create-table.id b/hoptimator-kafka/src/test/resources/kafka-ddl-create-table.id index bcf3687e..32efc51a 100644 --- a/hoptimator-kafka/src/test/resources/kafka-ddl-create-table.id +++ b/hoptimator-kafka/src/test/resources/kafka-ddl-create-table.id @@ -3,7 +3,7 @@ # Verify create table plan — !specify previews the KafkaTopic YAML without executing create or replace table "KAFKA"."create-table-test" ("KEY" VARCHAR, "VALUE" BINARY) WITH ("kafka.partitions" '5'); -apiVersion: kafka.strimzi.io/v1beta2 +apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: kafka-database-create-table-test @@ -55,7 +55,7 @@ spec: upgradeMode: stateless state: running --- -apiVersion: kafka.strimzi.io/v1beta2 +apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: kafka-database-create-table-test @@ -69,7 +69,7 @@ spec: retention.ms: 7200000 segment.bytes: 1073741824 --- -apiVersion: kafka.strimzi.io/v1beta2 +apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: kafka-database-existing-topic-2 diff --git a/hoptimator-kafka/src/test/resources/kafka-ddl.id b/hoptimator-kafka/src/test/resources/kafka-ddl.id index 32b76d33..556118dc 100644 --- a/hoptimator-kafka/src/test/resources/kafka-ddl.id +++ b/hoptimator-kafka/src/test/resources/kafka-ddl.id @@ -41,7 +41,7 @@ spec: upgradeMode: stateless state: running --- -apiVersion: kafka.strimzi.io/v1beta2 +apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: kafka-database-existing-topic-1 @@ -55,7 +55,7 @@ spec: retention.ms: 7200000 segment.bytes: 1073741824 --- -apiVersion: kafka.strimzi.io/v1beta2 +apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: kafka-database-existing-topic-2 diff --git a/hoptimator-logical/src/test/resources/logical-ddl.id b/hoptimator-logical/src/test/resources/logical-ddl.id index 975f7d4d..7284ae72 100644 --- a/hoptimator-logical/src/test/resources/logical-ddl.id +++ b/hoptimator-logical/src/test/resources/logical-ddl.id @@ -204,7 +204,7 @@ spec: upgradeMode: stateless state: running --- -apiVersion: kafka.strimzi.io/v1beta2 +apiVersion: kafka.strimzi.io/v1 kind: KafkaTopic metadata: name: kafka-database-create-table-test From 18c02bb43844ff403d88fb66f5cf1f6df006cd88 Mon Sep 17 00:00:00 2001 From: Ryanne Dolan Date: Thu, 30 Apr 2026 11:51:16 -0500 Subject: [PATCH 2/2] Fix Kafka CRD for Strimzi 1.0.0 v1 API Remove spec.kafka.replicas (now managed by KafkaNodePool), update metadataVersion to 4.2-IV1, and remove strimzi.io/node-pools and strimzi.io/kraft annotations (KRaft is the only mode in 1.0.0). Co-Authored-By: Claude Opus 4.6 (1M context) --- deploy/dev/kafka.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/deploy/dev/kafka.yaml b/deploy/dev/kafka.yaml index 8a7ce128..ec166024 100644 --- a/deploy/dev/kafka.yaml +++ b/deploy/dev/kafka.yaml @@ -58,14 +58,10 @@ kind: Kafka metadata: name: one namespace: kafka - annotations: - strimzi.io/node-pools: enabled - strimzi.io/kraft: enabled spec: kafka: version: 4.2.0 - metadataVersion: "4.0" - replicas: 1 + metadataVersion: 4.2-IV1 listeners: - name: plain port: 9094