diff options
| -rw-r--r-- | 10broker-config.yml | 6 | ||||
| -rw-r--r-- | 50kafka.yml | 2 | ||||
| -rwxr-xr-x | qa-yolean.sh | 1 | ||||
| -rw-r--r-- | zookeeper/50pzoo.yml | 6 | ||||
| -rw-r--r-- | zookeeper/51zoo.yml | 6 |
5 files changed, 5 insertions, 16 deletions
diff --git a/10broker-config.yml b/10broker-config.yml index 8f9d9d5..7d296bf 100644 --- a/10broker-config.yml +++ b/10broker-config.yml @@ -8,8 +8,8 @@ data: #!/bin/bash set -x - export KAFKA_BROKER_ID=${HOSTNAME##*-} - sed -i "s/\${KAFKA_BROKER_ID}/$KAFKA_BROKER_ID/" /etc/kafka/server.properties + KAFKA_BROKER_ID=${HOSTNAME##*-} + sed -i "s/#init#broker.id=#init#/broker.id=$KAFKA_BROKER_ID/" /etc/kafka/server.properties hash kubectl 2>/dev/null || { sed -i "s/#init#broker.rack=#init#/#init#broker.rack=# kubectl not found in path/" /etc/kafka/server.properties @@ -45,7 +45,7 @@ data: ############################# Server Basics ############################# # The id of the broker. This must be set to a unique integer for each broker. - broker.id=${KAFKA_BROKER_ID} + #init#broker.id=#init# #init#broker.rack=#init# diff --git a/50kafka.yml b/50kafka.yml index 2c42dc7..c564ffe 100644 --- a/50kafka.yml +++ b/50kafka.yml @@ -48,7 +48,7 @@ spec: requests: cpu: 100m memory: 512Mi - livenessProbe: + readinessProbe: exec: command: - /bin/sh diff --git a/qa-yolean.sh b/qa-yolean.sh index f6063f1..dcdd6f2 100755 --- a/qa-yolean.sh +++ b/qa-yolean.sh @@ -34,6 +34,7 @@ git checkout -b qa-yolean-$(date +"%Y%m%dT%H%M%S") for BRANCH in \ addon-storage-classes \ rolling-update \ + addon-rest \ addon-metrics \ addon-kube-events-topic do diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml index f9d5c58..7fd373c 100644 --- a/zookeeper/50pzoo.yml +++ b/zookeeper/50pzoo.yml @@ -43,12 +43,6 @@ spec: requests: cpu: 10m memory: 100Mi - livenessProbe: - exec: - command: - - /bin/sh - - -c - - '[ "imok" = "$(echo ruok | nc -w 1 127.0.0.1 2181)" ]' readinessProbe: exec: command: diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml index 778567d..f5d1f91 100644 --- a/zookeeper/51zoo.yml +++ b/zookeeper/51zoo.yml @@ -46,12 +46,6 @@ spec: requests: cpu: 10m memory: 100Mi - livenessProbe: - exec: - command: - - /bin/sh - - -c - - '[ "imok" = "$(echo ruok | nc -w 1 127.0.0.1 2181)" ]' readinessProbe: exec: command: |