✨ Use Kafka KRaft

go.mod

@@ -245,4 +245,4 @@ require (
 
 replace github.com/elazarl/goproxy => github.com/elazarl/goproxy v0.0.0-20240726154733-8b0c20506380
 
-replace github.com/RedHatInsights/strimzi-client-go => github.com/clyang82/strimzi-client-go v0.0.0-20240829073515-1fafe574af8b
+replace github.com/RedHatInsights/strimzi-client-go => github.com/clyang82/strimzi-client-go v0.0.0-20241128142517-2098cd6dda19

go.sum

@@ -195,8 +195,8 @@ github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/
 github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
 github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
 github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
-github.com/clyang82/strimzi-client-go v0.0.0-20240829073515-1fafe574af8b h1:dA0X/UTXHbX7iqZFnXd5mNDVwkR+h+v9Y41wBSotpms=
-github.com/clyang82/strimzi-client-go v0.0.0-20240829073515-1fafe574af8b/go.mod h1:7OPvvx8wg6NrP+3wbBoRlrE5UB0N0m3xeR/PZ2ofSHM=
+github.com/clyang82/strimzi-client-go v0.0.0-20241128142517-2098cd6dda19 h1:PCOeMeWqBzwrIC/ReekZipig4BEYGiHz/Gz+1Ou86nk=
+github.com/clyang82/strimzi-client-go v0.0.0-20241128142517-2098cd6dda19/go.mod h1:7OPvvx8wg6NrP+3wbBoRlrE5UB0N0m3xeR/PZ2ofSHM=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=

operator/api/operator/v1alpha4/multiclusterglobalhub_types.go

@@ -118,10 +118,6 @@ type AdvancedSpec struct {
 	// +optional
 	Kafka *CommonSpec `json:"kafka,omitempty"`
 
-	// Zookeeper specifies the desired state of zookeeper
-	// +optional
-	Zookeeper *CommonSpec `json:"zookeeper,omitempty"`
-
 	// Postgres specifies the desired state of postgres
 	// +optional
 	Postgres *CommonSpec `json:"postgres,omitempty"`

operator/bundle/manifests/multicluster-global-hub-operator.clusterserviceversion.yaml

@@ -31,7 +31,7 @@ metadata:
     categories: Integration & Delivery,OpenShift Optional
     certified: "false"
     containerImage: quay.io/stolostron/multicluster-global-hub-operator:latest
-    createdAt: "2024-11-26T09:39:57Z"
+    createdAt: "2024-11-29T07:44:42Z"
     description: Manages the installation and upgrade of the Multicluster Global Hub.
     olm.skipRange: '>=1.3.0 <1.4.0'
     operatorframework.io/initialization-resource: '{"apiVersion":"operator.open-cluster-management.io/v1alpha4",
@@ -147,9 +147,6 @@ spec:
     kafka-kafka-0                                           1/1     Running   0          20m
     kafka-kafka-1                                           1/1     Running   0          20m
     kafka-kafka-2                                           1/1     Running   0          20m
-    kafka-zookeeper-0                                       1/1     Running   0          21m
-    kafka-zookeeper-1                                       1/1     Running   0          21m
-    kafka-zookeeper-2                                       1/1     Running   0          21m
     multicluster-global-hub-grafana-5b7cfb6876-5rcnn        2/2     Running   0          19m
     multicluster-global-hub-grafana-5b7cfb6876-wq99v        2/2     Running   0          19m
     multicluster-global-hub-manager-7f56d78c49-hzfvw        1/1     Running   0          19m

operator/bundle/manifests/operator.open-cluster-management.io_multiclusterglobalhubs.yaml

@@ -221,38 +221,6 @@ spec:
                             type: object
                         type: object
                     type: object
-                  zookeeper:
-                    description: Zookeeper specifies the desired state of zookeeper
-                    properties:
-                      resources:
-                        description: Compute Resources required by this component
-                        properties:
-                          limits:
-                            additionalProperties:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                              x-kubernetes-int-or-string: true
-                            description: |-
-                              Limits describes the maximum amount of compute resources allowed.
-                              For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-                            type: object
-                          requests:
-                            additionalProperties:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                              x-kubernetes-int-or-string: true
-                            description: |-
-                              Requests describes the minimum amount of compute resources required.
-                              If requests are omitted for a container, it defaults to the specified limits.
-                              If there are no specified limits, it defaults to an implementation-defined value.
-                              For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-                            type: object
-                        type: object
-                    type: object
                 type: object
               availabilityConfig:
                 default: High

operator/config/crd/bases/operator.open-cluster-management.io_multiclusterglobalhubs.yaml

@@ -221,38 +221,6 @@ spec:
                             type: object
                         type: object
                     type: object
-                  zookeeper:
-                    description: Zookeeper specifies the desired state of zookeeper
-                    properties:
-                      resources:
-                        description: Compute Resources required by this component
-                        properties:
-                          limits:
-                            additionalProperties:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                              x-kubernetes-int-or-string: true
-                            description: |-
-                              Limits describes the maximum amount of compute resources allowed.
-                              For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-                            type: object
-                          requests:
-                            additionalProperties:
-                              anyOf:
-                              - type: integer
-                              - type: string
-                              pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
-                              x-kubernetes-int-or-string: true
-                            description: |-
-                              Requests describes the minimum amount of compute resources required.
-                              If requests are omitted for a container, it defaults to the specified limits.
-                              If there are no specified limits, it defaults to an implementation-defined value.
-                              For more information, see: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
-                            type: object
-                        type: object
-                    type: object
                 type: object
               availabilityConfig:
                 default: High

operator/config/manifests/bases/multicluster-global-hub-operator.clusterserviceversion.yaml

@@ -122,9 +122,6 @@ spec:
     kafka-kafka-0                                           1/1     Running   0          20m
     kafka-kafka-1                                           1/1     Running   0          20m
     kafka-kafka-2                                           1/1     Running   0          20m
-    kafka-zookeeper-0                                       1/1     Running   0          21m
-    kafka-zookeeper-1                                       1/1     Running   0          21m
-    kafka-zookeeper-2                                       1/1     Running   0          21m
     multicluster-global-hub-grafana-5b7cfb6876-5rcnn        2/2     Running   0          19m
     multicluster-global-hub-grafana-5b7cfb6876-wq99v        2/2     Running   0          19m
     multicluster-global-hub-manager-7f56d78c49-hzfvw        1/1     Running   0          19m

operator/pkg/constants/constants.go

@@ -120,8 +120,8 @@ const (
 	// KinDClusterIPKey defines a KinD container host which is used for test.
 	// It will be inject to the server certificates of kafka and inventory
 	KinDClusterIPKey = "global-hub.open-cluster-management.io/kind-cluster-ip"
-	// EnableKRaft enables run kafka with kraft
-	EnableKRaft = "global-hub.open-cluster-management.io/enable-kraft"
+	// KafkaUseNodeport indicates that Kafka is exposed via NodePort, and it is intended for testing purposes.
+	KafkaUseNodeport = "global-hub.open-cluster-management.io/kafka-use-nodeport"
 )
 
 // AggregationLevel specifies the level of aggregation leaf hubs should do before sending the information
@@ -179,12 +179,6 @@ const (
 	KafkaMemoryLimit   = "4Gi"
 	KafkaMemoryRequest = "128Mi"
 	KafkaCPURequest    = "25m"
-
-	// default resources for zookeeper
-	Zookeeper              = "zookeeper"
-	ZookeeperMemoryLimit   = "3Gi"
-	ZookeeperMemoryRequest = "500Mi"
-	ZookeeperCPURequest    = "20m"
 )
 
 const (