From 653c66c407829550e20315175622800baf2d5af8 Mon Sep 17 00:00:00 2001
From: JayGhiya <ghiya6548@gmail.com>
Date: Thu, 14 Mar 2024 15:58:21 +0530
Subject: [PATCH] fix: bug squashed

---
 charts/vespa/templates/service.yaml     | 2 +-
 charts/vespa/templates/statefulset.yaml | 6 +++---
 charts/vespa/values.yaml                | 3 +++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/charts/vespa/templates/service.yaml b/charts/vespa/templates/service.yaml
index 7eb6dd4..fab94ff 100644
--- a/charts/vespa/templates/service.yaml
+++ b/charts/vespa/templates/service.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: {{ .Values.service.name }}
   labels:
-    {{- include "vespa.labels" . | nindent 4 }}
+    {{- toYaml .Values.labels | nindent 4 }}
 spec:
   type: {{ .Values.service.type }}
   ports:
diff --git a/charts/vespa/templates/statefulset.yaml b/charts/vespa/templates/statefulset.yaml
index 2396e01..fe10647 100644
--- a/charts/vespa/templates/statefulset.yaml
+++ b/charts/vespa/templates/statefulset.yaml
@@ -3,8 +3,9 @@ kind: StatefulSet
 metadata:
   name: {{ .Values.statefulSet.name }}
   labels:
-    {{- include "vespa.labels" . | nindent 4 }}
+    {{- toYaml .Values.labels | nindent 4 }}
 spec:
+  serviceName: {{ .Values.statefulSet.name }}
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
@@ -18,7 +19,6 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "vespa.labels" . | nindent 8 }}
         {{- with .Values.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -53,7 +53,7 @@ spec:
           {{- end }}
           env:
           - name: VESPA_CONFIGSERVERS 
-            value: vespa-0.vespa.default.svc.cluster.local
+            value: vespa-0.vespa.{{ .Release.Namespace }}.svc.cluster.local
             
   volumeClaimTemplates:
   {{- range .Values.volumeClaimTemplates }}
diff --git a/charts/vespa/values.yaml b/charts/vespa/values.yaml
index 98d70a3..9e1a24c 100644
--- a/charts/vespa/values.yaml
+++ b/charts/vespa/values.yaml
@@ -57,6 +57,9 @@ securityContext:
   # runAsNonRoot: true
   runAsUser: 1000
 
+labels:
+  app: vespa
+
 service:
   name: document-index-service
   type: LoadBalancer