Merge pull request #59 from empathyco/chore/cache

fix: review motive-cache selector
empathyco · May 28, 2024 · f3984d1 · f3984d1
2 parents f2a3c8e + a8b4ec6
commit f3984d1
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 16 deletions.
diff --git a/charts/motive-cache/Chart.yaml b/charts/motive-cache/Chart.yaml
@@ -4,6 +4,6 @@ description: A Helm chart for Kubernetes
 
 type: application
 
-version: 0.1.2
+version: 0.1.3
 
 appVersion: "1.0.0"
diff --git a/charts/motive-cache/README.md b/charts/motive-cache/README.md
@@ -1,6 +1,6 @@
 # motive-cache
 
-![Version: 0.1.2](https://img.shields.io/badge/Version-0.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
+![Version: 0.1.3](https://img.shields.io/badge/Version-0.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 

diff --git a/charts/motive-cache/templates/_helpers.tpl b/charts/motive-cache/templates/_helpers.tpl
@@ -50,17 +50,6 @@ app.kubernetes.io/name: {{ include "motive-cache.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
-{{/*
-Create the name of the service account to use
-*/}}
-{{- define "motive-cache.serviceAccountName" -}}
-{{- if .Values.serviceAccount.create }}
-{{- default (include "motive-cache.fullname" .) .Values.serviceAccount.name }}
-{{- else }}
-{{- default "default" .Values.serviceAccount.name }}
-{{- end }}
-{{- end }}
-
 {{/*
 Common affinity definition
 Pod affinity

diff --git a/charts/motive-cache/templates/service.yaml b/charts/motive-cache/templates/service.yaml
@@ -24,6 +24,6 @@ spec:
       protocol: TCP
       targetPort: ctrl-metrics
   selector:
-    varnish-component: varnish
-    statefulset.kubernetes.io/pod-name: {{ include "motive-cache.fullname" $ }}-varnish-{{ . }}
+    {{- include "motive-cache.selectorLabels" $ | nindent 4 }}
+    apps.kubernetes.io/pod-index: {{ . | quote }}
 {{- end }}
diff --git a/charts/motive-cache/templates/varnish-cluster.yaml b/charts/motive-cache/templates/varnish-cluster.yaml
@@ -3,7 +3,7 @@ kind: VarnishCluster
 metadata:
   name: {{ include "motive-cache.fullname" . }}
   labels:
-    {{- include "motive-cache.labels" . | nindent 4 }}
+    {{- include "motive-cache.selectorLabels" . | nindent 4 }}
   {{- with .Values.annotations }}
   annotations:
     {{- toYaml . | nindent 4 }}