From f76e192ab4cdd5d0cc833690276a5eb3e7aa715d Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Mon, 8 Jan 2018 13:21:59 +0100
Subject: Sets other useful labels, for #78 and #56

---
 kafka/10broker-config.yml             | 7 +++++--
 rbac-namespace-default/pod-labler.yml | 9 ++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/kafka/10broker-config.yml b/kafka/10broker-config.yml
index d11eeaf..55a0c3b 100644
--- a/kafka/10broker-config.yml
+++ b/kafka/10broker-config.yml
@@ -21,6 +21,7 @@ data:
         sed -i "s/#init#broker.rack=#init#/#init#broker.rack=# zone label not found for node $NODE_NAME/" /etc/kafka/server.properties
       else
         sed -i "s/#init#broker.rack=#init#/broker.rack=$ZONE/" /etc/kafka/server.properties
+        kubectl -n $POD_NAMESPACE label pod $POD_NAME kafka-broker-rack=$ZONE
       fi
 
       kubectl -n $POD_NAMESPACE label pod $POD_NAME kafka-broker-id=$KAFKA_BROKER_ID
@@ -29,8 +30,10 @@ data:
       if [ $? -ne 0 ]; then
         echo "Outside (i.e. cluster-external access) host lookup command failed"
       else
-        OUTSIDE_HOST=${OUTSIDE_HOST}:3240${KAFKA_BROKER_ID}
-        sed -i "s|#init#advertised.listeners=OUTSIDE://#init#|advertised.listeners=OUTSIDE://${OUTSIDE_HOST}|" /etc/kafka/server.properties
+        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
+        kubectl -n $POD_NAMESPACE label pod $POD_NAME kafka-listener-outside-host=$OUTSIDE_HOST
+        kubectl -n $POD_NAMESPACE label pod $POD_NAME kafka-listener-outside-port=$OUTSIDE_PORT
       fi
     }
 
diff --git a/rbac-namespace-default/pod-labler.yml b/rbac-namespace-default/pod-labler.yml
index 78816a3..92745af 100644
--- a/rbac-namespace-default/pod-labler.yml
+++ b/rbac-namespace-default/pod-labler.yml
@@ -1,10 +1,9 @@
 # To see if init containers need RBAC:
 #
-# $ kubectl exec kafka-0 -- cat /etc/kafka/server.properties | grep broker.rack
-# #init#broker.rack=# zone lookup failed, see -c init-config logs
-# $ kubectl logs -c init-config kafka-0
-# ++ kubectl get node some-node '-o=go-template={{index .metadata.labels "failure-domain.beta.kubernetes.io/zone"}}'
-# Error from server (Forbidden): User "system:serviceaccount:kafka:default" cannot get nodes at the cluster scope.: "Unknown user \"system:serviceaccount:kafka:default\""
+# $ kubectl -n kafka logs kafka-2 -c init-config
+# ...
+# + kubectl -n kafka label pod kafka-2 kafka-broker-id=2
+# Error from server (Forbidden): pods "kafka-2" is forbidden: User "system:serviceaccount:kafka:default" cannot get pods in the namespace "kafka": Unknown user "system:serviceaccount:kafka:default"
 #
 ---
 kind: Role
-- 
cgit v1.2.3