From a34acc01f59b82438a72af4bcfbd01990f975c53 Mon Sep 17 00:00:00 2001 From: Kuvesz Date: Thu, 24 Feb 2022 17:15:27 +0100 Subject: [PATCH] Added support for Kafka 3.1.0 --- api/v1beta1/kafkacluster_types.go | 4 ++-- config/samples/banzaicloud_v1beta1_kafkacluster.yaml | 8 ++++---- config/samples/kafkacluster-prometheus.yaml | 6 +++--- config/samples/kafkacluster-with-istio.yaml | 2 +- config/samples/kafkacluster_with_external_ssl.yaml | 2 +- .../kafkacluster_with_external_ssl_customcert.yaml | 2 +- config/samples/kafkacluster_with_ssl_groups.yaml | 2 +- .../samples/kafkacluster_with_ssl_groups_customcert.yaml | 2 +- .../samples/kafkacluster_with_ssl_hybrid_customcert.yaml | 2 +- config/samples/kafkacluster_without_ssl.yaml | 2 +- config/samples/kafkacluster_without_ssl_groups.yaml | 2 +- .../samples/simplekafkacluster-with-brokerbindings.yaml | 2 +- .../simplekafkacluster-with-nodeport-external.yaml | 2 +- config/samples/simplekafkacluster.yaml | 4 ++-- config/samples/simplekafkacluster_affinity.yaml | 2 +- config/samples/simplekafkacluster_ebs_csi.yaml | 2 +- config/samples/simplekafkacluster_ssl.yaml | 2 +- .../simplekafkacluster_with_k8s_provided_nodeport.yaml | 2 +- config/samples/simplekafkacluster_with_sasl.yaml | 2 +- controllers/tests/clusterregistry/common_test.go | 2 +- controllers/tests/common_test.go | 2 +- .../tests/kafkacluster_controller_cruisecontrol_test.go | 2 +- controllers/tests/kafkacluster_controller_kafka_test.go | 2 +- docs/benchmarks/infrastructure/kafka.yaml | 2 +- docs/benchmarks/infrastructure/kafka_202001_3brokers.yaml | 2 +- 25 files changed, 32 insertions(+), 32 deletions(-) diff --git a/api/v1beta1/kafkacluster_types.go b/api/v1beta1/kafkacluster_types.go index 5300e792c..24aa6de97 100644 --- a/api/v1beta1/kafkacluster_types.go +++ b/api/v1beta1/kafkacluster_types.go @@ -627,7 +627,7 @@ func (kSpec *KafkaClusterSpec) GetClusterImage() string { if kSpec.ClusterImage != "" { return kSpec.ClusterImage } - return "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + return "ghcr.io/banzaicloud/kafka:2.13-3.1.0" } // GetClusterMetricsReporterImage returns the default container image for Kafka Cluster @@ -878,7 +878,7 @@ func (cConfig *CruiseControlConfig) GetCCImage() string { if cConfig.Image != "" { return cConfig.Image } - return "ghcr.io/banzaicloud/cruise-control:2.5.80" + return "ghcr.io/banzaicloud/cruise-control:2.5.85" } // GetCCLog4jConfig returns the used Cruise Control log4j configuration diff --git a/config/samples/banzaicloud_v1beta1_kafkacluster.yaml b/config/samples/banzaicloud_v1beta1_kafkacluster.yaml index a6198990e..24ef0d453 100644 --- a/config/samples/banzaicloud_v1beta1_kafkacluster.yaml +++ b/config/samples/banzaicloud_v1beta1_kafkacluster.yaml @@ -28,7 +28,7 @@ spec: oneBrokerPerNode: false # Specify the Kafka Broker related settings # clusterImage can specify the whole kafkacluster image in one place - #clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1 + #clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0 # readOnlyConfig specifies the read-only type kafka config cluster wide, all these will be merged with broker specified # readOnly configurations, so it can be overwritten per broker. #clusterWideConfig specifies the cluster-wide kafka config cluster wide, all these can be overridden per-broker @@ -71,7 +71,7 @@ spec: cruise.control.metrics.topic.replication.factor=2 brokerConfig: # Docker image used by the operator to create the Broker with id 0 - #image: "ghcr.io/banzaicloud/kafka:2.13-2.8.1 + #image: "ghcr.io/banzaicloud/kafka:2.13-3.1.0 # resourceRequirements works exactly like Container resources, the user can specify the limit and the requests # through this property #resourceRequirements: @@ -134,7 +134,7 @@ spec: #volumeMounts: # - mountPath: "/opt/kafka/libs/extra-jars" # name: "jars" - - image: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + - image: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" id: 1 config: | auto.create.topics.enable=false @@ -156,7 +156,7 @@ spec: readOnlyConfig: | auto.create.topics.enable=false brokerConfig: - image: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + image: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" storageConfigs: - mountPath: "/kafka-logs" pvcSpec: diff --git a/config/samples/kafkacluster-prometheus.yaml b/config/samples/kafkacluster-prometheus.yaml index a87ea3287..0651331ef 100644 --- a/config/samples/kafkacluster-prometheus.yaml +++ b/config/samples/kafkacluster-prometheus.yaml @@ -85,7 +85,7 @@ spec: storageClass: 'gp2' mountPath: '/kafkalog' diskSize: '10G' - image: 'ghcr.io/banzaicloud/kafka:2.13-2.8.1' + image: 'ghcr.io/banzaicloud/kafka:2.13-3.1.0' # annotations to be applied onto the broker pod # brokerAnnotations: '{ "sidecar.istio.io/logLevel": "trace", "sidecar.istio.io/proxyCPULimit": "50m" }' command: 'upScale' @@ -101,7 +101,7 @@ spec: storageClass: 'gp2' mountPath: '/kafkalog' diskSize: '10G' - image: 'ghcr.io/banzaicloud/kafka:2.13-2.8.1' + image: 'ghcr.io/banzaicloud/kafka:2.13-3.1.0' # annotations to be applied onto the broker pod # brokerAnnotations: '{ "sidecar.istio.io/logLevel": "trace", "sidecar.istio.io/proxyCPULimit": "50m" }' command: 'upScale' @@ -117,7 +117,7 @@ spec: storageClass: 'gp2' mountPath: '/kafkalog' diskSize: '10G' - image: 'ghcr.io/banzaicloud/kafka:2.13-2.8.1' + image: 'ghcr.io/banzaicloud/kafka:2.13-3.1.0' # annotations to be applied onto the broker pod # brokerAnnotations: '{ "sidecar.istio.io/logLevel": "trace", "sidecar.istio.io/proxyCPULimit": "50m" }' command: 'upScale' diff --git a/config/samples/kafkacluster-with-istio.yaml b/config/samples/kafkacluster-with-istio.yaml index 9397133ae..e41680e37 100644 --- a/config/samples/kafkacluster-with-istio.yaml +++ b/config/samples/kafkacluster-with-istio.yaml @@ -16,7 +16,7 @@ spec: zkAddresses: - "zookeeper-client.zookeeper:2181" oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/kafkacluster_with_external_ssl.yaml b/config/samples/kafkacluster_with_external_ssl.yaml index c287dfe1c..7d9acb4b5 100644 --- a/config/samples/kafkacluster_with_external_ssl.yaml +++ b/config/samples/kafkacluster_with_external_ssl.yaml @@ -9,7 +9,7 @@ spec: zkAddresses: - "zookeeper-client.zookeeper:2181" oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/kafkacluster_with_external_ssl_customcert.yaml b/config/samples/kafkacluster_with_external_ssl_customcert.yaml index aec7f2ff1..906a7cbb5 100644 --- a/config/samples/kafkacluster_with_external_ssl_customcert.yaml +++ b/config/samples/kafkacluster_with_external_ssl_customcert.yaml @@ -9,7 +9,7 @@ spec: zkAddresses: - "zookeeper-client.zookeeper:2181" oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/kafkacluster_with_ssl_groups.yaml b/config/samples/kafkacluster_with_ssl_groups.yaml index 339a7d3e3..2885be5b2 100644 --- a/config/samples/kafkacluster_with_ssl_groups.yaml +++ b/config/samples/kafkacluster_with_ssl_groups.yaml @@ -14,7 +14,7 @@ spec: - "failure-domain.beta.kubernetes.io/region" - "failure-domain.beta.kubernetes.io/zone" oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/kafkacluster_with_ssl_groups_customcert.yaml b/config/samples/kafkacluster_with_ssl_groups_customcert.yaml index 52b90df79..fb11e9d14 100644 --- a/config/samples/kafkacluster_with_ssl_groups_customcert.yaml +++ b/config/samples/kafkacluster_with_ssl_groups_customcert.yaml @@ -14,7 +14,7 @@ spec: - "failure-domain.beta.kubernetes.io/region" - "failure-domain.beta.kubernetes.io/zone" oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/kafkacluster_with_ssl_hybrid_customcert.yaml b/config/samples/kafkacluster_with_ssl_hybrid_customcert.yaml index e0da6fb02..8e9d75dc1 100644 --- a/config/samples/kafkacluster_with_ssl_hybrid_customcert.yaml +++ b/config/samples/kafkacluster_with_ssl_hybrid_customcert.yaml @@ -14,7 +14,7 @@ spec: - "failure-domain.beta.kubernetes.io/region" - "failure-domain.beta.kubernetes.io/zone" oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/kafkacluster_without_ssl.yaml b/config/samples/kafkacluster_without_ssl.yaml index efc7579c3..f3261fc9e 100644 --- a/config/samples/kafkacluster_without_ssl.yaml +++ b/config/samples/kafkacluster_without_ssl.yaml @@ -9,7 +9,7 @@ spec: zkAddresses: - "zookeeper-client.zookeeper:2181" oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/kafkacluster_without_ssl_groups.yaml b/config/samples/kafkacluster_without_ssl_groups.yaml index 697c70e44..86d0139a0 100644 --- a/config/samples/kafkacluster_without_ssl_groups.yaml +++ b/config/samples/kafkacluster_without_ssl_groups.yaml @@ -9,7 +9,7 @@ spec: zkAddresses: - "zookeeper-client.zookeeper:2181" oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/simplekafkacluster-with-brokerbindings.yaml b/config/samples/simplekafkacluster-with-brokerbindings.yaml index eb1360cbf..111813811 100644 --- a/config/samples/simplekafkacluster-with-brokerbindings.yaml +++ b/config/samples/simplekafkacluster-with-brokerbindings.yaml @@ -10,7 +10,7 @@ spec: - "zookeeper-client.zookeeper:2181" propagateLabels: false oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/simplekafkacluster-with-nodeport-external.yaml b/config/samples/simplekafkacluster-with-nodeport-external.yaml index 3798936f9..03c8521b8 100644 --- a/config/samples/simplekafkacluster-with-nodeport-external.yaml +++ b/config/samples/simplekafkacluster-with-nodeport-external.yaml @@ -10,7 +10,7 @@ spec: - "zookeeper-client.zookeeper:2181" propagateLabels: false oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/simplekafkacluster.yaml b/config/samples/simplekafkacluster.yaml index 9fb1274ca..4b04ff8c4 100644 --- a/config/samples/simplekafkacluster.yaml +++ b/config/samples/simplekafkacluster.yaml @@ -12,7 +12,7 @@ spec: - "zookeeper-client.zookeeper:2181" propagateLabels: false oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true @@ -78,7 +78,7 @@ spec: # limits: # cpu: 500m # memory: 1Gi -# image: "ghcr.io/banzaicloud/cruise-control:2.5.80" +# image: "ghcr.io/banzaicloud/cruise-control:2.5.85" config: | # Copyright 2017 LinkedIn Corp. Licensed under the BSD 2-Clause License (the "License"). See License in the project root for license information. # diff --git a/config/samples/simplekafkacluster_affinity.yaml b/config/samples/simplekafkacluster_affinity.yaml index 538f67112..a2d250ed3 100644 --- a/config/samples/simplekafkacluster_affinity.yaml +++ b/config/samples/simplekafkacluster_affinity.yaml @@ -12,7 +12,7 @@ spec: # If true OneBrokerPerNode ensures that each kafka broker will be placed on a different node unless a custom # Affinity definition overrides this behavior either set in brokerConfigGroups or in one specific brokerConfig oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/simplekafkacluster_ebs_csi.yaml b/config/samples/simplekafkacluster_ebs_csi.yaml index dcc31125c..bb80073cd 100644 --- a/config/samples/simplekafkacluster_ebs_csi.yaml +++ b/config/samples/simplekafkacluster_ebs_csi.yaml @@ -15,7 +15,7 @@ spec: zkPath: "/kafka" propagateLabels: true oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/simplekafkacluster_ssl.yaml b/config/samples/simplekafkacluster_ssl.yaml index b959e2c17..b92617c98 100644 --- a/config/samples/simplekafkacluster_ssl.yaml +++ b/config/samples/simplekafkacluster_ssl.yaml @@ -10,7 +10,7 @@ spec: - "zookeeper-client.zookeeper:2181" propagateLabels: false oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.6.0-bzc.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/simplekafkacluster_with_k8s_provided_nodeport.yaml b/config/samples/simplekafkacluster_with_k8s_provided_nodeport.yaml index f11155434..df8500d57 100644 --- a/config/samples/simplekafkacluster_with_k8s_provided_nodeport.yaml +++ b/config/samples/simplekafkacluster_with_k8s_provided_nodeport.yaml @@ -10,7 +10,7 @@ spec: - "zookeeper-client.zookeeper:2181" propagateLabels: false oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/config/samples/simplekafkacluster_with_sasl.yaml b/config/samples/simplekafkacluster_with_sasl.yaml index 40a0c22e5..fff7069b0 100644 --- a/config/samples/simplekafkacluster_with_sasl.yaml +++ b/config/samples/simplekafkacluster_with_sasl.yaml @@ -10,7 +10,7 @@ spec: - "zookeeper-client.zookeeper:2181" propagateLabels: false oneBrokerPerNode: false - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false cruise.control.metrics.topic.auto.create=true diff --git a/controllers/tests/clusterregistry/common_test.go b/controllers/tests/clusterregistry/common_test.go index 76f1e6cdc..19054600a 100644 --- a/controllers/tests/clusterregistry/common_test.go +++ b/controllers/tests/clusterregistry/common_test.go @@ -104,7 +104,7 @@ func createMinimalKafkaClusterCR(name, namespace string) *v1beta1.KafkaCluster { BrokerConfigGroup: defaultBrokerConfigGroup, }, }, - ClusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1", + ClusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0", ZKAddresses: []string{}, MonitoringConfig: v1beta1.MonitoringConfig{ CCJMXExporterConfig: "custom_property: custom_value", diff --git a/controllers/tests/common_test.go b/controllers/tests/common_test.go index 37b030bcd..f88d24ce9 100644 --- a/controllers/tests/common_test.go +++ b/controllers/tests/common_test.go @@ -106,7 +106,7 @@ func createMinimalKafkaClusterCR(name, namespace string) *v1beta1.KafkaCluster { BrokerConfigGroup: defaultBrokerConfigGroup, }, }, - ClusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1", + ClusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0", ZKAddresses: []string{}, MonitoringConfig: v1beta1.MonitoringConfig{ CCJMXExporterConfig: "custom_property: custom_value", diff --git a/controllers/tests/kafkacluster_controller_cruisecontrol_test.go b/controllers/tests/kafkacluster_controller_cruisecontrol_test.go index c1b4030e9..be7efc3ef 100644 --- a/controllers/tests/kafkacluster_controller_cruisecontrol_test.go +++ b/controllers/tests/kafkacluster_controller_cruisecontrol_test.go @@ -259,7 +259,7 @@ func expectCruiseControlDeployment(kafkaCluster *v1beta1.KafkaCluster) { Expect(container.Lifecycle).NotTo(BeNil()) Expect(container.Lifecycle.PreStop).NotTo(BeNil()) Expect(container.Lifecycle.PreStop.Exec).NotTo(BeNil()) - Expect(container.Image).To(Equal("ghcr.io/banzaicloud/cruise-control:2.5.80")) + Expect(container.Image).To(Equal("ghcr.io/banzaicloud/cruise-control:2.5.85")) Expect(container.Ports).To(ConsistOf( corev1.ContainerPort{ ContainerPort: 8090, diff --git a/controllers/tests/kafkacluster_controller_kafka_test.go b/controllers/tests/kafkacluster_controller_kafka_test.go index 3946ff57f..5be0857c1 100644 --- a/controllers/tests/kafkacluster_controller_kafka_test.go +++ b/controllers/tests/kafkacluster_controller_kafka_test.go @@ -251,7 +251,7 @@ func expectKafkaBrokerPod(kafkaCluster *v1beta1.KafkaCluster, broker v1beta1.Bro Expect(pod.Spec.Containers[1]).To(WithTransform(getContainerName, Equal("test-container"))) container := pod.Spec.Containers[0] Expect(container.Name).To(Equal("kafka")) - Expect(container.Image).To(Equal("ghcr.io/banzaicloud/kafka:2.13-2.8.1")) + Expect(container.Image).To(Equal("ghcr.io/banzaicloud/kafka:2.13-3.1.0")) Expect(container.Lifecycle).NotTo(BeNil()) Expect(container.Lifecycle.PreStop).NotTo(BeNil()) getEnvName := func(c corev1.EnvVar) string { return c.Name } diff --git a/docs/benchmarks/infrastructure/kafka.yaml b/docs/benchmarks/infrastructure/kafka.yaml index 1f52b5978..dcb76bf7f 100644 --- a/docs/benchmarks/infrastructure/kafka.yaml +++ b/docs/benchmarks/infrastructure/kafka.yaml @@ -9,7 +9,7 @@ spec: zkAddresses: - "zookeeper-client.zookeeper:2181" oneBrokerPerNode: true - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false rackAwareness: diff --git a/docs/benchmarks/infrastructure/kafka_202001_3brokers.yaml b/docs/benchmarks/infrastructure/kafka_202001_3brokers.yaml index 5aa93fc39..91bac08cb 100644 --- a/docs/benchmarks/infrastructure/kafka_202001_3brokers.yaml +++ b/docs/benchmarks/infrastructure/kafka_202001_3brokers.yaml @@ -65,7 +65,7 @@ spec: zkAddresses: - "zookeeper-client.zookeeper:2181" oneBrokerPerNode: true - clusterImage: "ghcr.io/banzaicloud/kafka:2.13-2.8.1" + clusterImage: "ghcr.io/banzaicloud/kafka:2.13-3.1.0" readOnlyConfig: | auto.create.topics.enable=false min.insync.replicas=3