Fix cluster metadata env variables

Author: kalindudc

applications/python-echo-server/Dockerfile

@@ -37,10 +37,11 @@ COPY . .
 
 RUN chmod +x /app/main.py
 
-
 # Switch to the non-privileged user to run the application.
 USER appuser
 
+RUN apt-get -y update; apt-get -y install curl dnsutils
+
 # Expose the port that the application listens on.
 EXPOSE 8080
 

applications/python-echo-server/deploy/manifest.yaml

@@ -32,6 +32,25 @@ spec:
       - env:
         - name: PORT
           value: "8080"
+        - name: NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
+        envFrom:
+        - configMapRef:
+            name: cluster-metadata
         image: docker.io/library/python-echo-server:latest
         name: python-echo-server
         ports:

applications/python-echo-server/main.py

@@ -33,9 +33,8 @@ def ping():
   def echo():
     kubernetes_info = [
       "Kubernetes Info: ",
-      "\tHostname: " + os.environ.get("HOSTNAME", "N/A"),
       "\tCluster Name: " + os.environ.get("CLUSTER_NAME", "N/A"),
-      "\tNamespace: " + os.environ.get("POD_NAMESPACE", "N/A"),
+      "\tNamespace: " + os.environ.get("NAMESPACE", "N/A"),
       "\tNode Name: " + os.environ.get("NODE_NAME", "N/A"),
       "\tPod Name: " + os.environ.get("POD_NAME", "N/A"),
       "\tPod IP: " + os.environ.get("POD_IP", "N/A"),

scripts/deploy.sh

@@ -46,5 +46,6 @@ fi
 while IFS= read -r target
 do
   kubectl --context $target create namespace "$NAMESPACE" 2>/dev/null || true
+  kubectl --context $target -n $NAMESPACE create configmap cluster-metadata --from-literal="CLUSTER_NAME=$target"
   krane deploy $NAMESPACE $target -f $DEPLOY_PATH
 done < $DEPLOY_PATH/TARGETS