update kafka

dev-upgrade/kafka/kafka-release.yaml

@@ -1,82 +0,0 @@
----
-apiVersion: platform.confluent.io/v1beta1
-kind: Kafka
-metadata:
-  name: kafka
-spec:
-  replicas: 3
-  configOverrides:
-    server:
-      - auto.create.topics.enable=true
-      - default.replication.factor=3
-    jvm:
-      - "-Xmx512m"
-  podTemplate:
-    resources:
-      requests:
-        memory: "256Mi"
-        cpu: "100m"
-      limits:
-        memory: "4G"
-        cpu: "1"
-    affinity:
-      # podAntiAffinity:
-      #   requiredDuringSchedulingIgnoredDuringExecution:
-      #     - labelSelector:
-      #         matchExpressions:
-      #         - key: app
-      #           operator: In
-      #           values:
-      #           - kafka
-      #       topologyKey: kubernetes.io/hostname
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-          - matchExpressions:
-            - key: app.kubernetes.io/name
-              operator: In
-              values:
-              - trainer
-  image:
-    application: confluentinc/cp-server:7.4.0
-    init: confluentinc/confluent-init-container:2.6.0
-  dataVolumeCapacity: 20Gi
-  storageClass:
-    name: local-kafka
-  metricReporter:
-    enabled: true
-  dependencies:
-    zookeeper:
-      endpoint: zookeeper-0.zookeeper.common.svc:2181/release,zookeeper-1.zookeeper.common.svc:2181/release,zookeeper-2.zookeeper.common.svc:2181/release
----
-apiVersion: platform.confluent.io/v1beta1
-kind: SchemaRegistry
-metadata:
-  name: schemaregistry
-spec:
-  replicas: 3
-  configOverrides:
-    jvm:
-      - "-Xmx128m"
-  podTemplate:
-    affinity:
-      # podAntiAffinity:
-      #   requiredDuringSchedulingIgnoredDuringExecution:
-      #     - labelSelector:
-      #         matchExpressions:
-      #         - key: app
-      #           operator: In
-      #           values:
-      #           - schemaregistry
-      #       topologyKey: kubernetes.io/hostname
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-          - matchExpressions:
-            - key: app.kubernetes.io/name
-              operator: In
-              values:
-              - trainer
-  image:
-    application: confluentinc/cp-schema-registry:7.4.0
-    init: confluentinc/confluent-init-container:2.6.0

dev-upgrade/kafka/kafka.yaml

@@ -1,5 +1,32 @@
 ---
 apiVersion: platform.confluent.io/v1beta1
+kind: Zookeeper
+metadata:
+  name: zookeeper
+spec:
+  replicas: 3
+  configOverrides:
+    jvm:
+      - "-Xmx128m"
+  podTemplate:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: app.kubernetes.io/name
+              operator: In
+              values:
+              - trainer
+  image:
+    application: confluentinc/cp-zookeeper:7.4.0
+    init: confluentinc/confluent-init-container:2.6.0
+  dataVolumeCapacity: 10Gi
+  logVolumeCapacity: 10Gi
+  storageClass:
+    name: local-kafka
+---
+apiVersion: platform.confluent.io/v1beta1
 kind: Kafka
 metadata:
   name: kafka
@@ -20,15 +47,6 @@ spec:
         memory: "4G"
         cpu: "1"
     affinity:
-      # podAntiAffinity:
-      #   requiredDuringSchedulingIgnoredDuringExecution:
-      #     - labelSelector:
-      #         matchExpressions:
-      #         - key: app
-      #           operator: In
-      #           values:
-      #           - kafka
-      #       topologyKey: kubernetes.io/hostname
       nodeAffinity:
         requiredDuringSchedulingIgnoredDuringExecution:
           nodeSelectorTerms:
@@ -45,9 +63,10 @@ spec:
     name: local-kafka
   metricReporter:
     enabled: true
-  dependencies:
-    zookeeper:
-      endpoint: zookeeper-0-internal.common.svc:2181/dev,zookeeper-1-internal.common.svc:2181/dev,zookeeper-2-internal.common.svc:2181/dev
+  # dependencies:
+  # 多个kakfa集群复用zk
+  #   zookeeper:
+  #     endpoint: zookeeper.common.svc.cluster.local:2181
 ---
 apiVersion: platform.confluent.io/v1beta1
 kind: SchemaRegistry
@@ -60,15 +79,6 @@ spec:
       - "-Xmx128m"
   podTemplate:
     affinity:
-      # podAntiAffinity:
-      #   requiredDuringSchedulingIgnoredDuringExecution:
-      #     - labelSelector:
-      #         matchExpressions:
-      #         - key: app
-      #           operator: In
-      #           values:
-      #           - schemaregistry
-      #       topologyKey: kubernetes.io/hostname
       nodeAffinity:
         requiredDuringSchedulingIgnoredDuringExecution:
           nodeSelectorTerms:

dev-upgrade/kafka/storage.yaml

@@ -1,13 +1,3 @@
----
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: local-zookeeper
-provisioner: openebs.io/local
-reclaimPolicy: Retain
-allowVolumeExpansion: true
-volumeBindingMode: WaitForFirstConsumer
-
 ---
 apiVersion: storage.k8s.io/v1
 kind: StorageClass

dev-upgrade/kafka/zookeeper.yaml

@@ -1,36 +0,0 @@
----
-apiVersion: platform.confluent.io/v1beta1
-kind: Zookeeper
-metadata:
-  name: zookeeper
-spec:
-  replicas: 3
-  configOverrides:
-    jvm:
-      - "-Xmx128m"
-  podTemplate:
-    affinity:
-      # podAntiAffinity:
-      #   requiredDuringSchedulingIgnoredDuringExecution:
-      #     - labelSelector:
-      #         matchExpressions:
-      #         - key: app
-      #           operator: In
-      #           values:
-      #           - zookeeper
-      #       topologyKey: kubernetes.io/hostname
-      nodeAffinity:
-        requiredDuringSchedulingIgnoredDuringExecution:
-          nodeSelectorTerms:
-          - matchExpressions:
-            - key: app.kubernetes.io/name
-              operator: In
-              values:
-              - trainer
-  image:
-    application: confluentinc/cp-zookeeper:7.4.0
-    init: confluentinc/confluent-init-container:2.6.0
-  dataVolumeCapacity: 10Gi
-  logVolumeCapacity: 10Gi
-  storageClass:
-    name: local-zookeeper