fix(chart): Add missing labels (#306)

* fix(chart): Add missing labels * Add missing label * fix syntax issue
relaycorp · Nov 29, 2020 · 62efd0c · 62efd0c
1 parent 52d7d7c
commit 62efd0c
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/chart/templates/generated-cm.yml b/chart/templates/generated-cm.yml
@@ -5,5 +5,7 @@ metadata:
   annotations:
     "helm.sh/hook": "pre-install"
     "helm.sh/hook-weight": "-5"
+  labels:
+    {{- include "relaynet-internet-gateway.labels" . | nindent 4 }}
 data:
   GATEWAY_KEY_ID: {{ default (randAlphaNum 12 | b64enc) .Values.gatewayKeyId | quote }}
diff --git a/chart/templates/global-cm.yml b/chart/templates/global-cm.yml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "relaynet-internet-gateway.fullname" . }}
+  labels:
+    {{- include "relaynet-internet-gateway.labels" . | nindent 4 }}
 data:
   NATS_SERVER_URL: {{ .Values.nats.serverUrl }}
   NATS_CLUSTER_ID: {{ .Values.nats.clusterId }}

diff --git a/chart/templates/global-secret.yml b/chart/templates/global-secret.yml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "relaynet-internet-gateway.fullname" . }}
+  labels:
+    {{- include "relaynet-internet-gateway.labels" . | nindent 4 }}
 type: Opaque
 data:
   MONGO_PASSWORD: {{ .Values.mongo.password | b64enc }}

diff --git a/chart/templates/keygen-job.yml b/chart/templates/keygen-job.yml
@@ -13,9 +13,7 @@ spec:
     metadata:
       name: "{{ .Release.Name }}-keygen"
       labels:
-        app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
-        app.kubernetes.io/instance: {{ .Release.Name | quote }}
-        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        {{- include "relaynet-internet-gateway.labels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ include "relaynet-internet-gateway.serviceAccountName" . }}-keygen
       securityContext:

diff --git a/chart/templates/mongo-cm.yml b/chart/templates/mongo-cm.yml
@@ -2,6 +2,8 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "relaynet-internet-gateway.fullname" . }}-mongo
+  labels:
+    {{- include "relaynet-internet-gateway.labels" . | nindent 4 }}
 data:
   MONGO_URI: {{ .Values.mongo.uri }}
   MONGO_DB: {{ .Values.mongo.db }}

diff --git a/chart/templates/vault-config-job.yml b/chart/templates/vault-config-job.yml
@@ -4,7 +4,7 @@ kind: Job
 metadata:
   name: {{ include "relaynet-internet-gateway.fullname" . }}-vault-config
   labels:
-  {{- include "relaynet-internet-gateway.labels" . | nindent 4 }}
+    {{- include "relaynet-internet-gateway.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": post-install
     "helm.sh/hook-weight": "0"
@@ -14,9 +14,7 @@ spec:
     metadata:
       name: "{{ .Release.Name }}-vault-config"
       labels:
-        app.kubernetes.io/managed-by: {{ .Release.Service | quote }}
-        app.kubernetes.io/instance: {{ .Release.Name | quote }}
-        helm.sh/chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        {{- include "relaynet-internet-gateway.labels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ include "relaynet-internet-gateway.serviceAccountName" . }}-vault-config
       securityContext:

diff --git a/chart/templates/vault-config-sa.yml b/chart/templates/vault-config-sa.yml
@@ -4,7 +4,7 @@ kind: ServiceAccount
 metadata:
   name: {{ include "relaynet-internet-gateway.serviceAccountName" . }}-vault-config
   labels:
-  {{- include "relaynet-internet-gateway.labels" . | nindent 4 }}
+    {{- include "relaynet-internet-gateway.labels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": post-install
     "helm.sh/hook-weight": "-1"