From d6292ca4b0ba2c5051840bc76489b2dfe609f62a Mon Sep 17 00:00:00 2001
From: Lars Scheibling <lars@scheibling.se>
Date: Sat, 23 Sep 2023 13:41:10 +0000
Subject: [PATCH] Fixed labels

---
 .gitlab-ci.yml                  | 2 +-
 Chart/templates/_helpers.tpl    | 2 +-
 Chart/templates/deployment.yaml | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7adb467..30e3864 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  HELM_CHART_VERSION: "1.0.20"
+  HELM_CHART_VERSION: "1.0.21"
 
 stages:
   - deploy
diff --git a/Chart/templates/_helpers.tpl b/Chart/templates/_helpers.tpl
index 5b28433..212bf95 100644
--- a/Chart/templates/_helpers.tpl
+++ b/Chart/templates/_helpers.tpl
@@ -48,8 +48,8 @@ cloudyne.systems/site: {{ .Values.site.domain | quote }}
 {{- end }}
 {{- define "..selector-labels" -}}
 cloudyne.systems/customer: {{ .Values.customer.legalName | replace " " "-" | replace "," "" | trunc 63 | trimSuffix "-" | quote }}
-cloudyne.systems/customer-legal-id: '{{ .Values.customer.legalId }}'
 cloudyne.systems/site: {{ .Values.site.domain | quote }}
+cloudyne.systems/component: site
 {{- end }}
 {{- define "..affinity-labels" -}}
 podAffinity:
diff --git a/Chart/templates/deployment.yaml b/Chart/templates/deployment.yaml
index 45ff337..7aae0e6 100644
--- a/Chart/templates/deployment.yaml
+++ b/Chart/templates/deployment.yaml
@@ -4,7 +4,6 @@ metadata:
   name: {{ include "..fullname" . }}
   labels:
     {{- include "..labels" . | nindent 4 }}
-    cloudyne.systems/component: site
 spec:
   {{- if .Values.site.resources }}
   replicas: {{ .Values.site.resources.replicas | default 1 }}
@@ -12,10 +11,12 @@ spec:
   replicas: 1
   {{- end }}
   selector:
-    matchLabels: {{- include "..selector-labels" . | nindent 6 }}
+    matchLabels: 
+      {{- include "..selector-labels" . | nindent 6 }}
   template:
     metadata:
-      labels: {{- include "..selector-labels" . | nindent 8 }}
+      labels:
+        {{- include "..selector-labels" . | nindent 8 }}
     spec:
       securityContext:
         fsGroup: 101