From 1e5145d8db75cb464c4abc0518d9a15669170fdd Mon Sep 17 00:00:00 2001
From: JayGhiya <ghiya6548@gmail.com>
Date: Wed, 27 Mar 2024 12:23:42 +0530
Subject: [PATCH] Revert "Fix labels and service selector"

---
 charts/vespa/Chart.yaml                 |  2 +-
 charts/vespa/templates/service.yaml     |  2 +-
 charts/vespa/templates/statefulset.yaml |  7 +++----
 charts/vespa/values.yaml                | 11 +++++++----
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/charts/vespa/Chart.yaml b/charts/vespa/Chart.yaml
index 16d519b..97ec9be 100644
--- 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.2
+version: 0.2.1
 
 # 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
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 1943400..fe10647 100644
--- a/charts/vespa/templates/statefulset.yaml
+++ b/charts/vespa/templates/statefulset.yaml
@@ -3,7 +3,7 @@ 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 }}
@@ -11,7 +11,7 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      {{- include "vespa.selectorLabels" . | nindent 6 }}
+      {{- toYaml .Values.selectorLabels | nindent 6 }}
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -19,7 +19,6 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "vespa.labels" . | nindent 8 }}
         {{- with .Values.podLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -65,4 +64,4 @@ spec:
       resources:
         requests:
           storage: {{ .spec.resources.requests.storage }}
-  {{- end }}
+  {{- end }}
\ No newline at end of file
diff --git a/charts/vespa/values.yaml b/charts/vespa/values.yaml
index 206cdc6..93571d8 100644
--- a/charts/vespa/values.yaml
+++ b/charts/vespa/values.yaml
@@ -26,10 +26,13 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
-
-# Additional annotations and labels to apply to pods
 podAnnotations: {}
-podLabels: {}
+podLabels:
+  app: vespa
+
+selectorLabels:
+  app: vespa
+  
 
 statefulSet:
   name: vespa
@@ -129,4 +132,4 @@ volumeClaimTemplates:
          - ReadWriteOnce
        resources:
          requests:
-           storage: 1Gi    
+           storage: 1Gi    
\ No newline at end of file