Revert back to wurstmeister/kafka:2.12-2.3.0

Resolves spring-cloud#3585
Feixu2015 · Oct 28, 2019 · 125cf15 · 125cf15
1 parent a5cdfd9
commit 125cf15
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 29 deletions.
diff --git a/src/kubernetes/kafka/kafka-deployment.yaml b/src/kubernetes/kafka/kafka-deployment.yaml
@@ -1,38 +1,37 @@
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: kafka-broker
   labels:
-    app: kafka-broker
+    app: kafka
     component: kafka-broker
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-      app: kafka-broker
   template:
     metadata:
       labels:
-        app: kafka-broker
-        component: kafka-broker-c
+        app: kafka
+        component: kafka-broker
     spec:
       containers:
-      - name: kafka-broker
-        image: confluentinc/cp-kafka:5.3.1
+      - name: kafka
+        image: wurstmeister/kafka:2.12-2.3.0
         ports:
         - containerPort: 9092
         env:
-          - name: KAFKA_ADVERTISED_LISTENERS
-            value: PLAINTEXT://kafka-broker:9092
           - name: ENABLE_AUTO_EXTEND
             value: "true"
           - name: KAFKA_RESERVED_BROKER_MAX_ID
             value: "999999999"
+          - name: KAFKA_AUTO_CREATE_TOPICS_ENABLE
+            value: "false"
+          - name: KAFKA_PORT
+            value: "9092"
+          - name: KAFKA_ADVERTISED_PORT
+            value: "9092"
           - name: KAFKA_ADVERTISED_HOST_NAME
             valueFrom:
               fieldRef:
                 fieldPath: status.podIP
           - name: KAFKA_ZOOKEEPER_CONNECT
             value: kafka-zk:2181
-          - name: KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR
-            value: "1"
diff --git a/src/kubernetes/kafka/kafka-svc.yaml b/src/kubernetes/kafka/kafka-svc.yaml
@@ -1,16 +1,16 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: kafka-broker
+  name: kafka
   labels:
-    app: kafka-broker
+    app: kafka
     component: kafka-broker
 spec:
   ports:
   - port: 9092
-    name: kafka-broker-port
+    name: kafka-port
     targetPort: 9092
     protocol: TCP
   selector:
-    app: kafka-broker
-    component: kafka-broker-c
+    app: kafka
+    component: kafka-broker
diff --git a/src/kubernetes/kafka/kafka-zk-deployment.yaml b/src/kubernetes/kafka/kafka-zk-deployment.yaml
@@ -1,15 +1,12 @@
-apiVersion: apps/v1
+apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   name: kafka-zk
   labels:
-    app: kafka-broker
+    app: kafka
     component: kafka-zk
 spec:
   replicas: 1
-  selector:
-    matchLabels:
-      app: kafka-zk
   template:
     metadata:
       labels:
@@ -18,14 +15,11 @@ spec:
     spec:
       containers:
       - name: kafka-zk
-        image: confluentinc/cp-zookeeper:5.3.1
+        image: digitalwonderland/zookeeper
         ports:
         - containerPort: 2181
         env:
         - name: ZOOKEEPER_ID
           value: "1"
         - name: ZOOKEEPER_SERVER_1
           value: kafka-zk
-        - name: ZOOKEEPER_CLIENT_PORT
-          value: "2181"
-
diff --git a/src/kubernetes/kafka/kafka-zk-svc.yaml b/src/kubernetes/kafka/kafka-zk-svc.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: kafka-zk
   labels:
-    app: kafka-broker
+    app: kafka
     component: kafka-zk
 spec:
   ports:

diff --git a/src/kubernetes/skipper/skipper-config-kafka.yaml b/src/kubernetes/skipper/skipper-config-kafka.yaml
@@ -14,7 +14,7 @@ data:
               kubernetes:
                 accounts:
                   default:
-                    environmentVariables: 'SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS=${KAFKA_BROKER_SERVICE_HOST}:${KAFKA_BROKER_SERVICE_PORT},SPRING_CLOUD_STREAM_KAFKA_BINDER_ZK_NODES=${KAFKA_ZK_SERVICE_HOST}:${KAFKA_ZK_SERVICE_PORT}'
+                    environmentVariables: 'SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS=${KAFKA_SERVICE_HOST}:${KAFKA_SERVICE_PORT},SPRING_CLOUD_STREAM_KAFKA_BINDER_ZK_NODES=${KAFKA_ZK_SERVICE_HOST}:${KAFKA_ZK_SERVICE_PORT}'
                     limits:
                       memory: 1024Mi
                       cpu: 500m