From 6e81ed7b40af2a37a92514c9b02a1966b7f9e473 Mon Sep 17 00:00:00 2001
From: "anthony.lin" <anthony.jclin@gmail.com>
Date: Fri, 18 May 2018 23:07:43 +0800
Subject: [PATCH] Update Labels - Application/Component

1) Kubernetes Template (Bootstrap)
2) Other charts within Promenade Repo

Change-Id: I872802112587bdff84d3630a5b2542dc4b3f77f8
---
 charts/coredns/templates/pod-test.yaml                     | 6 ++++++
 charts/coredns/values.yaml                                 | 3 +++
 charts/etcd/templates/daemonset-anchor.yaml                | 6 +++++-
 charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl        | 7 +++++--
 charts/etcd/templates/tests/test-etcd-health.yaml          | 4 ++++
 charts/haproxy/templates/etc/_haproxy.yaml.tpl             | 4 ++++
 charts/promenade/templates/tests/test-promenade-api.yaml   | 2 ++
 .../kubernetes/manifests/auxiliary-kubernetes-etcd.yaml    | 1 +
 .../genesis/etc/kubernetes/manifests/bootstrap-armada.yaml | 2 +-
 .../etc/kubernetes/manifests/kubernetes-apiserver.yaml     | 2 ++
 .../manifests/kubernetes-controller-manager.yaml           | 1 +
 .../genesis/etc/kubernetes/manifests/kubernetes-etcd.yaml  | 2 ++
 .../etc/kubernetes/manifests/kubernetes-scheduler.yaml     | 1 +
 13 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/charts/coredns/templates/pod-test.yaml b/charts/coredns/templates/pod-test.yaml
index 25c9a116..21583def 100644
--- a/charts/coredns/templates/pod-test.yaml
+++ b/charts/coredns/templates/pod-test.yaml
@@ -13,6 +13,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */}}
+
+{{- if .Values.manifests.pod_test }}
+{{- $envAll := . }}
 ---
 apiVersion: v1
 kind: Pod
@@ -20,6 +23,8 @@ metadata:
   name: {{ print .Release.Name "-test" }}
   annotations:
     "helm.sh/hook": test-success
+  labels:
+{{ tuple $envAll "coredns" "test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   restartPolicy: Never
   containers:
@@ -44,3 +49,4 @@ spec:
             echo "Test failed to resolve all names."
             exit 1
           fi
+{{- end }}
diff --git a/charts/coredns/values.yaml b/charts/coredns/values.yaml
index 3bf66b66..a021f76f 100644
--- a/charts/coredns/values.yaml
+++ b/charts/coredns/values.yaml
@@ -60,3 +60,6 @@ monitoring:
     coredns:
       scrape: true
       port: 9253
+
+manifests:
+  pod_test: true
diff --git a/charts/etcd/templates/daemonset-anchor.yaml b/charts/etcd/templates/daemonset-anchor.yaml
index b4891196..0931fccb 100644
--- a/charts/etcd/templates/daemonset-anchor.yaml
+++ b/charts/etcd/templates/daemonset-anchor.yaml
@@ -17,6 +17,10 @@ limitations under the License.
 {{- if .Values.manifests.daemonset_anchor }}
 {{- $envAll := . }}
 {{- $mounts_daemonset_anchor := .Values.pod.mounts.daemonset_anchor.daemonset_anchor }}
+# Strip off "etcd" from service name to get the application name
+# Note that application can either be kubernetes or calico for now
+# and may expand in scope in the future
+{{- $applicationName := .Values.service.name | replace "-etcd" "" }}
 ---
 apiVersion: extensions/v1beta1
 kind: DaemonSet
@@ -29,7 +33,7 @@ spec:
       annotations:
         scheduler.alpha.kubernetes.io/critical-pod: ''
       labels:
-{{ tuple $envAll "kubernetes" "anchor" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
+{{ tuple $envAll $applicationName "etcd-anchor" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
     spec:
       hostNetwork: true
       {{- if .Values.anchor.dns_policy }}
diff --git a/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl b/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl
index 3f22a154..c40c0f8b 100644
--- a/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl
+++ b/charts/etcd/templates/etc/_kubernetes-etcd.yaml.tpl
@@ -14,8 +14,11 @@
 # limitations under the License.
 */}}
 
-{{- if .Values.manifests.service }}
 {{- $envAll := . }}
+# Strip off "etcd" from service name to get the application name
+# Note that application can either be kubernetes or calico for now
+# and may expand in scope in the future
+{{- $applicationName := .Values.service.name | replace "-etcd" "" }}
 ---
 apiVersion: v1
 kind: Pod
@@ -24,6 +27,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{ .Values.service.name }}-service: enabled
+{{ tuple $envAll $applicationName "etcd" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   hostNetwork: true
   containers:
@@ -104,4 +108,3 @@ spec:
     - name: etc
       hostPath:
         path: {{ .Values.etcd.host_etc_path }}
-{{- end }}
diff --git a/charts/etcd/templates/tests/test-etcd-health.yaml b/charts/etcd/templates/tests/test-etcd-health.yaml
index fcd88e2c..a1f33c7f 100644
--- a/charts/etcd/templates/tests/test-etcd-health.yaml
+++ b/charts/etcd/templates/tests/test-etcd-health.yaml
@@ -16,6 +16,8 @@
 {{/*
 Test etcdctl endpoint health */}}
 {{- if .Values.manifests.test_etcd_health }}
+{{- $envAll := . }}
+{{- $applicationName := .Release.Name }}
 ---
 apiVersion: v1
 kind: Pod
@@ -23,6 +25,8 @@ metadata:
   name: "{{ .Release.Name }}-etcd-test"
   annotations:
     "helm.sh/hook": "test-success"
+  labels:
+{{ tuple $envAll $applicationName "etcd-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   nodeSelector:
     {{ .Values.labels.anchor.node_selector_key }}: {{ .Values.labels.anchor.node_selector_value }}
diff --git a/charts/haproxy/templates/etc/_haproxy.yaml.tpl b/charts/haproxy/templates/etc/_haproxy.yaml.tpl
index c4141b3c..25315207 100644
--- a/charts/haproxy/templates/etc/_haproxy.yaml.tpl
+++ b/charts/haproxy/templates/etc/_haproxy.yaml.tpl
@@ -13,12 +13,16 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */}}
+
+{{- $envAll := . }}
 ---
 apiVersion: v1
 kind: Pod
 metadata:
   name: haproxy
   namespace: {{ .Release.Namespace }}
+  labels:
+{{ tuple $envAll "haproxy" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   hostNetwork: true
   containers:
diff --git a/charts/promenade/templates/tests/test-promenade-api.yaml b/charts/promenade/templates/tests/test-promenade-api.yaml
index f9d27b8e..2f640022 100644
--- a/charts/promenade/templates/tests/test-promenade-api.yaml
+++ b/charts/promenade/templates/tests/test-promenade-api.yaml
@@ -25,6 +25,8 @@ metadata:
   name: "{{ .Release.Name }}-api-test"
   annotations:
     "helm.sh/hook": "test-success"
+  labels:
+{{ tuple $envAll "promenade" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
 spec:
   restartPolicy: Never
   initContainers:
diff --git a/promenade/templates/roles/genesis/etc/kubernetes/manifests/auxiliary-kubernetes-etcd.yaml b/promenade/templates/roles/genesis/etc/kubernetes/manifests/auxiliary-kubernetes-etcd.yaml
index 8d94b700..ad1ecb8b 100644
--- a/promenade/templates/roles/genesis/etc/kubernetes/manifests/auxiliary-kubernetes-etcd.yaml
+++ b/promenade/templates/roles/genesis/etc/kubernetes/manifests/auxiliary-kubernetes-etcd.yaml
@@ -5,6 +5,7 @@ metadata:
   name: auxiliary-etcd
   namespace: kube-system
   labels:
+    application: kubernetes
     component: auxiliary-etcd
     promenade: genesis
 spec:
diff --git a/promenade/templates/roles/genesis/etc/kubernetes/manifests/bootstrap-armada.yaml b/promenade/templates/roles/genesis/etc/kubernetes/manifests/bootstrap-armada.yaml
index f50d3eaa..adfa41ef 100644
--- a/promenade/templates/roles/genesis/etc/kubernetes/manifests/bootstrap-armada.yaml
+++ b/promenade/templates/roles/genesis/etc/kubernetes/manifests/bootstrap-armada.yaml
@@ -5,7 +5,7 @@ metadata:
   name: bootstrap-armada
   namespace: kube-system
   labels:
-    app: promenade
+    application: promenade
     component: genesis-tiller
 spec:
   dnsPolicy: Default
diff --git a/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-apiserver.yaml b/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-apiserver.yaml
index 80ab27ad..9a98509f 100644
--- a/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-apiserver.yaml
+++ b/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-apiserver.yaml
@@ -5,6 +5,8 @@ metadata:
   name: kubernetes-apiserver
   namespace: kube-system
   labels:
+    application: kubernetes
+    component: apiserver
     kubernetes-apiserver-service: enabled
   annotations:
     scheduler.alpha.kubernetes.io/critical-pod: ''
diff --git a/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-controller-manager.yaml b/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-controller-manager.yaml
index a4f32206..a4ef7546 100644
--- a/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-controller-manager.yaml
+++ b/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-controller-manager.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: kube-system
   labels:
     tier: control-plane
+    application: kubernetes
     component: kube-controller-manager
   annotations:
     scheduler.alpha.kubernetes.io/critical-pod: ''
diff --git a/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-etcd.yaml b/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-etcd.yaml
index 4375af22..c0811b5f 100644
--- a/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-etcd.yaml
+++ b/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-etcd.yaml
@@ -5,6 +5,8 @@ metadata:
   name: kubernetes-etcd
   namespace: kube-system
   labels:
+    application: kubernetes
+    component: etcd
     # NOTE: This label needs coordination with the etcd deployed via chart.
     kubernetes-etcd-service: enabled
 spec:
diff --git a/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-scheduler.yaml b/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-scheduler.yaml
index 2f762de5..e419b51b 100644
--- a/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-scheduler.yaml
+++ b/promenade/templates/roles/genesis/etc/kubernetes/manifests/kubernetes-scheduler.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: kube-system
   labels:
     tier: control-plane
+    application: kubernetes
     component: kube-scheduler
   annotations:
     scheduler.alpha.kubernetes.io/critical-pod: ''