diff options
| author | solsson <solsson@gmail.com> | 2018-01-29 08:45:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-29 08:45:32 +0100 |
| commit | 8b8e49a6728e157b6258e6d0007e4d5552c1198a (patch) | |
| tree | 913fcd472a68d82e8e8d517d2d61053c26668144 | |
| parent | ac67d1c88be26b3ba9af7b24b8ec558d893016c1 (diff) | |
| parent | b0d09f71426a931500dd0bff57b1c6bda52605f8 (diff) | |
| download | kubernetes-kafka-8b8e49a6728e157b6258e6d0007e4d5552c1198a.tar.gz kubernetes-kafka-8b8e49a6728e157b6258e6d0007e4d5552c1198a.tar.bz2 kubernetes-kafka-8b8e49a6728e157b6258e6d0007e4d5552c1198a.zip | |
Merge pull request #137 from Yolean/outside-host-as-annotation
Move outside host info from labels to annotations
| -rw-r--r-- | kafka/10broker-config.yml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kafka/10broker-config.yml b/kafka/10broker-config.yml index 2846232..1fe67c0 100644 --- a/kafka/10broker-config.yml +++ b/kafka/10broker-config.yml @@ -12,6 +12,7 @@ data: sed -i "s/#init#broker.id=#init#/broker.id=$KAFKA_BROKER_ID/" /etc/kafka/server.properties LABELS="kafka-broker-id=$KAFKA_BROKER_ID" + ANNOTATIONS="" hash kubectl 2>/dev/null || { sed -i "s/#init#broker.rack=#init#/#init#broker.rack=# kubectl not found in path/" /etc/kafka/server.properties @@ -32,12 +33,15 @@ data: else OUTSIDE_PORT=3240${KAFKA_BROKER_ID} sed -i "s|#init#advertised.listeners=OUTSIDE://#init#|advertised.listeners=OUTSIDE://${OUTSIDE_HOST}:${OUTSIDE_PORT}|" /etc/kafka/server.properties - LABELS="$LABELS kafka-listener-outside-host=$OUTSIDE_HOST kafka-listener-outside-port=$OUTSIDE_PORT" + ANNOTATIONS="$ANNOTATIONS kafka-listener-outside-host=$OUTSIDE_HOST kafka-listener-outside-port=$OUTSIDE_PORT" fi if [ ! -z "$LABELS" ]; then kubectl -n $POD_NAMESPACE label pod $POD_NAME $LABELS || echo "Failed to label $POD_NAMESPACE.$POD_NAME - RBAC issue?" fi + if [ ! -z "$ANNOTATIONS" ]; then + kubectl -n $POD_NAMESPACE annotate pod $POD_NAME $ANNOTATIONS || echo "Failed to annotate $POD_NAMESPACE.$POD_NAME - RBAC issue?" + fi } server.properties: |- |