Merge pull request #14 from trail-of-forks/main

Fix labels and service selector
unoplat · Mar 27, 2024 · 74fe08a · 74fe08a
2 parents 61adce0 + 1b5b234
commit 74fe08a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/charts/vespa/Chart.yaml b/charts/vespa/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.1
+version: 0.2.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

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
@@ -3,22 +3,23 @@ kind: StatefulSet
 metadata:
   name: {{ .Values.statefulSet.name }}
   labels:
-    {{- toYaml .Values.labels | nindent 4 }}
+    {{- include "vespa.labels" . | nindent 4 }}
 spec:
   serviceName: {{ .Values.statefulSet.name }}
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- 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