[GitHub] rabbah closed pull request #117: Switch to vanilla wurstmeister/kafka:0.11.0.1

[GitBox <gi...@apache.org>]

rabbah closed pull request #117: Switch to vanilla wurstmeister/kafka:0.11.0.1
URL: https://github.com/apache/incubator-openwhisk-deploy-kube/pull/117
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/kubernetes/kafka/kafka.yml b/kubernetes/kafka/kafka.yml
index 18db28a..19817cf 100644
--- a/kubernetes/kafka/kafka.yml
+++ b/kubernetes/kafka/kafka.yml
@@ -34,33 +34,24 @@ spec:
       containers:
       - name: kafka
         imagePullPolicy: IfNotPresent
-        # custom kafka image. Should be eliminated soon (see issue #26)
-        image: dgrove/whisk_kafka
+        image: wurstmeister/kafka:0.11.0.1
         ports:
         - name: kafka
           containerPort: 9092
         env:
+        - name: "KAFKA_BROKER_ID"
+          value: "0"
         - name: "KAFKA_ADVERTISED_HOST_NAME"
           value: "$(KAFKA_SERVICE_HOST)"
+        - name: "KAFKA_ADVERTISED_PORT"
+          value: "$(KAFKA_SERVICE_PORT_KAFKA)"
+        - name: "KAFKA_HOST_NAME"
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
         - name: "KAFKA_PORT"
           value: "$(KAFKA_SERVICE_PORT_KAFKA)"
 
-        # message settings
-        - name: "REPLICATION_FACTOR"
-          value: "1"
-        - name: "PARTITIONS"
-          value: "1"
-
-        # health topic settings
-        - name: "KAFKA_TOPICS_HEALTH_RETENTIONBYTES"
-          value: "536870912"
-        - name: "KAFKA_TOPICS_HEALTH_RETENTIONMS"
-          value: "1073741824"
-        - name: "KAFKA_TOPICS_HEALTH_SEGMENTBYTES"
-          value: "3600000"
-
         # zookeeper info
-        - name: "ZOOKEEPER_HOST"
-          value: "$(ZOOKEEPER_SERVICE_HOST)"
-        - name: "ZOOKEEPER_PORT"
-          value: "$(ZOOKEEPER_SERVICE_PORT_ZOOKEEPER)"
+        - name: "KAFKA_ZOOKEEPER_CONNECT"
+          value: "$(ZOOKEEPER_SERVICE_HOST):$(ZOOKEEPER_SERVICE_PORT_ZOOKEEPER)"


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services