adding the ability to define extraLabels for the kubernetes Service o…

…bject
apollographql · Aug 17, 2023 · edae0f7 · edae0f7
1 parent 9116fa6
commit edae0f7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/helm/chart/router/templates/_helpers.tpl b/helm/chart/router/templates/_helpers.tpl
@@ -112,7 +112,9 @@ extraLabels:
 ```
 */}}
 {{- define "common.templatizeExtraLabels" -}}
-{{- range $key, $value := .Values.extraLabels }}
-{{ printf "%s: %s" $key (include  "common.tplvalues.render" ( dict "value" $value "context" $))}}
+{{- $extraLabels := .extraLabels -}}
+{{- $ctx := .context -}}
+{{- range $key, $value := $extraLabels }}
+{{ printf "%s: %s" $key (include "common.tplvalues.render" (dict "value" $value "context" $ctx)) }}
 {{- end -}}
 {{- end -}}
diff --git a/helm/chart/router/templates/deployment.yaml b/helm/chart/router/templates/deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   labels:
     {{- include "router.labels" . | nindent 4 }}
     {{- if .Values.extraLabels }}
-    {{- include "common.templatizeExtraLabels" . | nindent 4 }}
+    {{ include "common.templatizeExtraLabels" (dict "extraLabels" .Values.extraLabels "context" $) | nindent 4 }}
     {{- end }}
   {{/* There may not be much configuration so check that there is something */}}
   {{- if (((((.Values.router).configuration).telemetry).metrics).prometheus).enabled }}
@@ -35,7 +35,7 @@ spec:
       labels:
         {{- include "router.selectorLabels" . | nindent 8 }}
         {{- if .Values.extraLabels }}
-        {{- include "common.templatizeExtraLabels" . | nindent 8 }}
+        {{ include "common.templatizeExtraLabels" (dict "extraLabels" .Values.extraLabels "context" $) | nindent 8 }}
         {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}

diff --git a/helm/chart/router/templates/service.yaml b/helm/chart/router/templates/service.yaml
@@ -4,6 +4,9 @@ metadata:
   name: {{ include "router.fullname" . }}
   labels:
     {{- include "router.labels" . | nindent 4 }}
+    {{- if .Values.service.extraLabels }}
+    {{ include "common.templatizeExtraLabels" (dict "extraLabels" .Values.service.extraLabels "context" $) | indent 4 }}
+    {{- end }}
   {{- with .Values.service.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}

diff --git a/helm/chart/router/values.yaml b/helm/chart/router/values.yaml
@@ -99,7 +99,8 @@ initContainers: []
 # extraLabels:
 #   label_one_name: "label_one_value"
 #   label_two_name: "label_two_value"
-extraLabels: {}
+extraLabels:
+  somethingExtra: "{{ .Release.Name }}"
 
 lifecycle: {}
 #  preStop:
@@ -139,6 +140,9 @@ service:
   type: ClusterIP
   port: 80
   annotations: {}
+  extraLabels:
+    testing: hello
+    testing2: hello
 
 serviceMonitor:
   enabled: false