Merge pull request #8590 from OpenMined/rasswanth/fix-helm-upgrade

Fix Helm Upgrade
OpenMined · Mar 15, 2024 · 7150dcf · 7150dcf
2 parents 9e283e6 + dfd526c
commit 7150dcf
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/packages/grid/helm/syft/templates/_labels.tpl b/packages/grid/helm/syft/templates/_labels.tpl
@@ -20,6 +20,12 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
 helm.sh/chart: {{ include "common.chartname" . }}
 {{- end -}}
 
+{{- define "common.volumeLabels" -}}
+app.kubernetes.io/name: {{ .Chart.Name }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
 {{/*
 Common labels for all resources
 Usage:

diff --git a/packages/grid/helm/syft/templates/backend/backend-statefulset.yaml b/packages/grid/helm/syft/templates/backend/backend-statefulset.yaml
@@ -157,7 +157,7 @@ spec:
   - metadata:
       name: credentials-data
       labels:
-        {{- include "common.labels" . | nindent 8 }}
+        {{- include "common.volumeLabels" . | nindent 8 }}
         app.kubernetes.io/component: backend
     spec:
       accessModes:

diff --git a/packages/grid/helm/syft/templates/mongo/mongo-statefulset.yaml b/packages/grid/helm/syft/templates/mongo/mongo-statefulset.yaml
@@ -50,7 +50,7 @@ spec:
   - metadata:
       name: mongo-data
       labels:
-        {{- include "common.labels" . | nindent 8 }}
+        {{- include "common.volumeLabels" . | nindent 8 }}
         app.kubernetes.io/component: mongo
     spec:
       accessModes:

diff --git a/packages/grid/helm/syft/templates/registry/registry-statefulset.yaml b/packages/grid/helm/syft/templates/registry/registry-statefulset.yaml
@@ -56,7 +56,7 @@ spec:
   - metadata:
       name: registry-data
       labels:
-        {{- include "common.labels" . | nindent 8 }}
+        {{- include "common.volumeLabels" . | nindent 8 }}
         app.kubernetes.io/component: registry
     spec:
       accessModes:

diff --git a/packages/grid/helm/syft/templates/seaweedfs/seaweedfs-statefulset.yaml b/packages/grid/helm/syft/templates/seaweedfs/seaweedfs-statefulset.yaml
@@ -66,7 +66,7 @@ spec:
   - metadata:
       name: seaweedfs-data
       labels:
-        {{- include "common.labels" . | nindent 8 }}
+        {{- include "common.volumeLabels" . | nindent 8 }}
         app.kubernetes.io/component: seaweedfs
     spec:
       accessModes: