fix labels

unoplat · Mar 19, 2024 · ff5d5f5 · ff5d5f5
1 parent 821aceb
commit ff5d5f5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/charts/vespa/templates/service.yaml b/charts/vespa/templates/service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: {{ .Values.service.name }}
   labels:
-    {{- toYaml .Values.labels | nindent 4 }}
+    {{- include "vespa.labels" . | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:

diff --git a/charts/vespa/templates/statefulset.yaml b/charts/vespa/templates/statefulset.yaml
@@ -11,14 +11,15 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- toYaml .Values.selectorLabels | nindent 6 }}
+      {{- include "vespa.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
+        {{- include "vespa.labels" . | nindent 8 }}
         {{- with .Values.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -64,4 +65,4 @@ spec:
       resources:
         requests:
           storage: {{ .spec.resources.requests.storage }}
-  {{- end }}
+  {{- end }}
diff --git a/charts/vespa/values.yaml b/charts/vespa/values.yaml
@@ -26,13 +26,10 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
-podAnnotations: {}
-podLabels:
-  app: vespa
 
-selectorLabels:
-  app: vespa
-  
+# Additional annotations and labels to apply to pods
+podAnnotations: {}
+podLabels: {}
 
 statefulSet:
   name: vespa
@@ -132,4 +129,4 @@ volumeClaimTemplates:
          - ReadWriteOnce
        resources:
          requests:
-           storage: 1Gi    
+           storage: 1Gi