aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStaffan Olsson <staffan@repos.se>2017-07-26 16:48:14 +0200
committerStaffan Olsson <staffan@repos.se>2017-07-26 16:48:14 +0200
commit0d534e8ad6f0766cb29293b148ffc9ee6bdec35f (patch)
treed0ce2da3edf0c1beb1a95cea71888802fe9af768
parentbe5a82037682d9b1ebd907a367e839ecd71aa1fa (diff)
downloadkubernetes-kafka-0d534e8ad6f0766cb29293b148ffc9ee6bdec35f.tar.gz
kubernetes-kafka-0d534e8ad6f0766cb29293b148ffc9ee6bdec35f.tar.bz2
kubernetes-kafka-0d534e8ad6f0766cb29293b148ffc9ee6bdec35f.zip
Moves broker.id config into init script
-rw-r--r--10broker-config.yml9
-rw-r--r--50kafka.yml3
2 files changed, 7 insertions, 5 deletions
diff --git a/10broker-config.yml b/10broker-config.yml
index b6ecf1c..af0f037 100644
--- a/10broker-config.yml
+++ b/10broker-config.yml
@@ -5,8 +5,11 @@ metadata:
apiVersion: v1
data:
init.sh: |-
- echo "I guess I'm running in the init container"
- sed -i 's/%p %m/%p -INIT-WAS-HERE- %m/' /etc/kafka/log4j.properties
+ #!/bin/bash
+ set -x
+
+ export KAFKA_BROKER_ID=${HOSTNAME##*-}
+ sed -i "s/\${KAFKA_BROKER_ID}/$KAFKA_BROKER_ID/" /etc/kafka/server.properties
server.properties: |-
# Licensed to the Apache Software Foundation (ASF) under one or more
@@ -29,7 +32,7 @@ data:
############################# Server Basics #############################
# The id of the broker. This must be set to a unique integer for each broker.
- broker.id=0
+ broker.id=${KAFKA_BROKER_ID}
# Switch to enable topic deletion or not, default value is false
#delete.topic.enable=true
diff --git a/50kafka.yml b/50kafka.yml
index 930dcda..c55edc5 100644
--- a/50kafka.yml
+++ b/50kafka.yml
@@ -18,7 +18,7 @@ spec:
initContainers:
- name: init-config
image: solsson/kafka:0.11.0.0@sha256:b27560de08d30ebf96d12e74f80afcaca503ad4ca3103e63b1fd43a2e4c976ce
- command: ['/bin/sh', '-ec', '. /etc/kafka/init.sh']
+ command: ['/bin/bash', '/etc/kafka/init.sh']
volumeMounts:
- name: config
mountPath: /etc/kafka
@@ -52,7 +52,6 @@ spec:
--override zookeeper.connect=zookeeper:2181
--override log.retention.hours=-1
--override log.dirs=/var/lib/kafka/data/topics
- --override broker.id=${HOSTNAME##*-}
--override auto.create.topics.enable=false
resources:
requests: