make helm chart working with good labels

georchestra · Feb 12, 2025 · b4f8499 · b4f8499
1 parent 8cb6d3a
commit b4f8499
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 14 deletions.
diff --git a/helm/templates/_bootstrap-maelstro-configuration.tpl b/helm/templates/_bootstrap-maelstro-configuration.tpl
@@ -18,7 +18,7 @@
   {{- end }}
   volumeMounts:
   - mountPath: /etc/georchestra
-    name: maelstro-configuration
+    name: georchestra-datadir
   {{- if .Values.datadir.git.ssh_secret }}
   - mountPath: /ssh-secret
     name: ssh-secret

diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
@@ -35,7 +35,6 @@ Common labels
 */}}
 {{- define "helm-maelstro.labels" -}}
 helm.sh/chart: {{ include "helm-maelstro.chart" . }}
-{{ include "helm-maelstro.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
@@ -50,6 +49,16 @@ app.kubernetes.io/name: {{ include "helm-maelstro.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
 
+{{- define "helm-maelstro.selectorLabelsFrontend" -}}
+app.kubernetes.io/name: {{ include "helm-maelstro.name" . }}-maelstro-frontend
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
+{{- define "helm-maelstro.selectorLabelsBackend" -}}
+app.kubernetes.io/name: {{ include "helm-maelstro.name" . }}-maelstro-backend
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- end }}
+
 {{/*
 Create the name of the service account to use
 */}}

diff --git a/helm/templates/maelstro-backend-deployment.yaml b/helm/templates/maelstro-backend-deployment.yaml
@@ -3,21 +3,21 @@ kind: Deployment
 metadata:
   name: {{ include "helm-maelstro.fullname" . }}-maelstro-backend-deployment
   labels:
+    {{- include "helm-maelstro.selectorLabelsBackend" . | nindent 4 }}
     {{- include "helm-maelstro.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.maelstro_backend.replicaCount }}
   selector:
     matchLabels:
-      {{- include "helm-maelstro.selectorLabels" . | nindent 6 }}
+      {{- include "helm-maelstro.selectorLabelsBackend" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.maelstro_backend.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "helm-maelstro.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/name: {{ include "helm-maelstro.fullname" . }}-maelstro-backend-deployment
+        {{- include "helm-maelstro.selectorLabelsBackend" . | nindent 8 }}
     spec:
       {{- if .Values.datadir.git.url }}
       initContainers:
@@ -92,4 +92,4 @@ spec:
       {{- with .Values.maelstro_backend.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}
diff --git a/helm/templates/maelstro-backend-svc.yaml b/helm/templates/maelstro-backend-svc.yaml
@@ -12,4 +12,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-     app.kubernetes.io/name: {{ include "helm-maelstro.fullname" . }}-maelstro-backend-deployment
+     app.kubernetes.io/name: {{ include "helm-maelstro.fullname" . }}-maelstro-backend
diff --git a/helm/templates/maelstro-frontend-deployment.yaml b/helm/templates/maelstro-frontend-deployment.yaml
@@ -3,21 +3,21 @@ kind: Deployment
 metadata:
   name: {{ include "helm-maelstro.fullname" . }}-maelstro-frontend-deployment
   labels:
+    {{- include "helm-maelstro.selectorLabelsFrontend" . | nindent 4 }}
     {{- include "helm-maelstro.labels" . | nindent 4 }}
 spec:
   replicas: {{ .Values.maelstro_frontend.replicaCount }}
   selector:
     matchLabels:
-      {{- include "helm-maelstro.selectorLabels" . | nindent 6 }}
+      {{- include "helm-maelstro.selectorLabelsFrontend" . | nindent 6 }}
   template:
     metadata:
       {{- with .Values.maelstro_frontend.podAnnotations }}
       annotations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       labels:
-        {{- include "helm-maelstro.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/name: {{ include "helm-maelstro.fullname" . }}-maelstro-frontend-deployment
+        {{- include "helm-maelstro.selectorLabelsFrontend" . | nindent 8 }}
     spec:
       {{- if .Values.datadir.git.url }}
       initContainers:
@@ -78,4 +78,4 @@ spec:
       {{- with .Values.maelstro_frontend.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}
diff --git a/helm/templates/maelstro-frontend-svc.yaml b/helm/templates/maelstro-frontend-svc.yaml
@@ -12,4 +12,4 @@ spec:
       protocol: TCP
       name: http
   selector:
-     app.kubernetes.io/name: {{ include "helm-maelstro.fullname" . }}-maelstro-frontend-deployment
+     app.kubernetes.io/name: {{ include "helm-maelstro.fullname" . }}-maelstro-frontend
diff --git a/helm/templates/maelstro-secrets.yaml b/helm/templates/maelstro-secrets.yaml
@@ -6,10 +6,10 @@ metadata:
   labels:
     {{- include "helm-maelstro.labels" . | nindent 4 }}
 type: Opaque
-data: |
+data: 
 {{- range .Values.credentials }}
 {{ .name | indent 2 }}_USERNAME: {{ .username | b64enc }}
 {{ .name | indent 2 }}_PASSWORD: {{ .password | b64enc }}
 {{ .name | indent 2 }}_URL: {{ .url | b64enc }}
 {{- end }}
-{{- end }}
+{{- end }}