Merge branch 'main' into add-node-selector

jetstack · Mar 22, 2024 · b3a5f1e · b3a5f1e
2 parents eba9ab7 + 8473f86
commit b3a5f1e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/deploy/charts/version-checker/templates/_helpers.tpl b/deploy/charts/version-checker/templates/_helpers.tpl
@@ -25,3 +25,11 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
+
+{{/*
+Common selector
+*/}}
+{{- define "version-checker.selector" -}}
+app.kubernetes.io/name: {{ include "version-checker.name" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end -}}
diff --git a/deploy/charts/version-checker/templates/deployment.yaml b/deploy/charts/version-checker/templates/deployment.yaml
@@ -13,7 +13,7 @@ spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      {{- include "version-checker.labels" . | nindent 6 }}
+      {{- include "version-checker.selector" . | nindent 6 }}
   template:
     metadata:
       labels:

diff --git a/deploy/charts/version-checker/templates/service.yaml b/deploy/charts/version-checker/templates/service.yaml
@@ -19,4 +19,4 @@ spec:
       protocol: TCP
       name: web
   selector:
-    {{ include "version-checker.labels" . | nindent 4 }}
+    {{- include "version-checker.selector" . | nindent 4 }}