es kafka

tcs-upgrade/elastic/elastic.yaml

@@ -95,7 +95,7 @@ spec:
       securityContext:
         fsGroup: 100
       nodeSelector:
-        app.kubernetes.io/name: es-tcs
+        app.kubernetes.io/name: tcs
       initContainers:
         - name: init
           image: busybox

tcs-upgrade/jenkins/jenkins.yaml

@@ -99,7 +99,7 @@ spec:
       serviceAccountName: jenkins-admin
       containers:
         - name: jenkins
-          image: jenkins/jenkins:2.410
+          image: jenkins/jenkins:2.414
           resources:
             limits:
               memory: "2Gi"

tcs-upgrade/kafka/kafka.yaml

@@ -3,23 +3,22 @@ apiVersion: platform.confluent.io/v1beta1
 kind: Zookeeper
 metadata:
   name: zookeeper
-  namespace: basic
 spec:
   replicas: 3
+  oneReplicaPerNode: true
   configOverrides:
     jvm:
       - "-Xmx128m"
   podTemplate:
     affinity:
-      podAntiAffinity:
+      nodeAffinity:
         requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: app
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: app.kubernetes.io/name
               operator: In
               values:
-                - zookeeper
-            topologyKey: kubernetes.io/hostname
+              - tcs
   image:
     application: confluentinc/cp-zookeeper:7.4.0
     init: confluentinc/confluent-init-container:2.6.0
@@ -32,9 +31,9 @@ apiVersion: platform.confluent.io/v1beta1
 kind: Kafka
 metadata:
   name: kafka
-  namespace: basic
 spec:
   replicas: 3
+  oneReplicaPerNode: true
   configOverrides:
     server:
       - auto.create.topics.enable=true
@@ -50,15 +49,14 @@ spec:
         memory: "4G"
         cpu: "1"
     affinity:
-      podAntiAffinity:
+      nodeAffinity:
         requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: app
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: app.kubernetes.io/name
               operator: In
               values:
-                - kafka
-            topologyKey: kubernetes.io/hostname
+              - tcs
   image:
     application: confluentinc/cp-server:7.4.0
     init: confluentinc/confluent-init-container:2.6.0
@@ -67,36 +65,47 @@ spec:
     name: local-kafka
   metricReporter:
     enabled: true
-  dependencies:
-    zookeeper:
-      endpoint: zookeeper.basic.svc.cluster.local:2181
+  listeners:
+      external:
+        # authentication:
+        #   type: plain
+        #   jaasConfig:                
+        #     secretRef: credentials
+        externalAccess:
+          type: nodePort
+          nodePort:
+            host: tcs-kafka.beaconfireinc.com
+            nodePortOffset: 30001
+  # dependencies:
+  # 多个kakfa集群复用zk
+  #   zookeeper:
+  #     endpoint: zookeeper.common.svc.cluster.local:2181
 ---
 apiVersion: platform.confluent.io/v1beta1
 kind: SchemaRegistry
 metadata:
   name: schemaregistry
-  namespace: basic
 spec:
   replicas: 3
+  oneReplicaPerNode: true
   configOverrides:
     jvm:
       - "-Xmx128m"
   podTemplate:
     affinity:
-      podAntiAffinity:
+      nodeAffinity:
         requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: app
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: app.kubernetes.io/name
               operator: In
               values:
-                - schemaregistry
-            topologyKey: kubernetes.io/hostname
+              - tcs
   image:
     application: confluentinc/cp-schema-registry:7.4.0
     init: confluentinc/confluent-init-container:2.6.0
   externalAccess:
     type: nodePort
     nodePort:
-      host: 10.2.0.10
-      nodePortOffset: 30035
+      host: tcs-kafka.beaconfireinc.com
+      nodePortOffset: 30005