Adds some kubernetes recommended labels to few places that was missing. (#1307)

library/common-test/tests/certificate/metadata_test.yaml

@@ -51,6 +51,8 @@ tests:
             release: RELEASE-NAME
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
+            app.kubernetes.io/name: common-test
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
             g_label1: global_label1

library/common-test/tests/configmap/metadata_test.yaml

@@ -48,6 +48,8 @@ tests:
             release: RELEASE-NAME
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
+            app.kubernetes.io/name: common-test
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
             g_label1: global_label1

library/common-test/tests/cronjob/metadata_test.yaml

@@ -57,6 +57,8 @@ tests:
             release: RELEASE-NAME
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
+            app.kubernetes.io/name: common-test
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
             g_label1: global_label1

library/common-test/tests/deployment/metadata_test.yaml

@@ -55,6 +55,8 @@ tests:
             release: RELEASE-NAME
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
+            app.kubernetes.io/name: common-test
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
             g_label1: global_label1

library/common-test/tests/imagePullSecret/metadata_test.yaml

@@ -51,6 +51,8 @@ tests:
             release: RELEASE-NAME
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
+            app.kubernetes.io/name: common-test
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
             g_label1: global_label1

library/common-test/tests/job/metadata_test.yaml

@@ -56,6 +56,8 @@ tests:
             release: RELEASE-NAME
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
+            app.kubernetes.io/name: common-test
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
             g_label1: global_label1

library/common-test/tests/rbac/metadata_test.yaml

@@ -80,6 +80,8 @@ tests:
             release: RELEASE-NAME
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
+            app.kubernetes.io/name: common-test
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
             g_label1: global_label1
@@ -105,6 +107,8 @@ tests:
             release: RELEASE-NAME
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
+            app.kubernetes.io/name: common-test
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
             g_label1: global_label1
@@ -130,6 +134,8 @@ tests:
             release: RELEASE-NAME
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
+            app.kubernetes.io/name: common-test
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
             g_label1: global_label1
@@ -155,6 +161,8 @@ tests:
             release: RELEASE-NAME
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
+            app.kubernetes.io/name: common-test
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
             g_label1: global_label1

library/common-test/tests/secret/metadata_test.yaml

@@ -48,6 +48,8 @@ tests:
             release: RELEASE-NAME
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
+            app.kubernetes.io/name: common-test
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
             g_label1: global_label1

library/common-test/tests/serviceAccount/metadata_test.yaml

@@ -47,6 +47,8 @@ tests:
             release: RELEASE-NAME
             helm-revision: "0"
             helm.sh/chart: common-test-1.0.0
+            app.kubernetes.io/name: common-test
+            app.kubernetes.io/instance: RELEASE-NAME
             app.kubernetes.io/managed-by: Helm
             app.kubernetes.io/version: *appVer
             g_label1: global_label1

library/common/templates/lib/metadata/_allLabels.tpl

@@ -5,6 +5,8 @@
 {{- define "ix.v1.common.lib.metadata.allLabels" -}}
 helm.sh/chart: {{ include "ix.v1.common.lib.chart.names.chart" . }}
 helm-revision: {{ .Release.Revision | quote }}
+app.kubernetes.io/name: {{ include "ix.v1.common.lib.chart.names.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app: {{ include "ix.v1.common.lib.chart.names.chart" . }}

library/common/templates/lib/metadata/_render.tpl

@@ -9,18 +9,27 @@
   {{- $annotations := .annotations -}}
   {{- $rootCtx := .rootCtx -}}
 
+  {{- $seenLabels := list -}}
+  {{- $seenAnnotations := list -}}
+
   {{- with $labels -}}
     {{- range $k, $v := . -}}
-      {{- if and $k $v }}
+      {{- if and $k $v -}}
+        {{- if not (mustHas $k $seenLabels) }}
 {{ $k }}: {{ tpl $v $rootCtx | quote }}
+          {{- $seenLabels = mustAppend $seenLabels $k -}}
+        {{- end -}}
       {{- end -}}
     {{- end -}}
   {{- end -}}
 
   {{- with $annotations -}}
     {{- range $k, $v := . -}}
-      {{- if and $k $v }}
+      {{- if and $k $v -}}
+        {{- if not (mustHas $k $seenAnnotations) }}
 {{ $k }}: {{ tpl $v $rootCtx | quote }}
+          {{- $seenAnnotations = mustAppend $seenAnnotations $k -}}
+        {{- end -}}
       {{- end -}}
     {{- end -}}
   {{- end -}}