From 6f9e58e6291bc14d925c684b54e517353d9edde8 Mon Sep 17 00:00:00 2001
From: karimatwa <karim-atwa@hotmail.com>
Date: Fri, 4 Oct 2024 20:28:40 +0200
Subject: [PATCH] chore: add correct labels and revert back nested checks

---
 helm-chart/templates/deployment.yaml | 74 ++++++++++++++++++----------
 helm-chart/values.yaml               | 24 ++++-----
 2 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/helm-chart/templates/deployment.yaml b/helm-chart/templates/deployment.yaml
index 311195a..dbe2f2d 100644
--- a/helm-chart/templates/deployment.yaml
+++ b/helm-chart/templates/deployment.yaml
@@ -4,62 +4,86 @@ metadata:
   name: {{ .Values.controlPlane.name }}-deploy
   namespace: {{ .Values.namespace }}
   labels:
-    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-    {{- toYaml .Values.controlPlane.deploymentLabels | nindent 4 }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+  {{- if .Values.controlPlane.deploymentLabels }}
+    {{ toYaml .Values.controlPlane.deploymentLabels | nindent 6 }}
+  {{- end }}
 spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      {{- toYaml .Values.controlPlane.podLabels | nindent 6 }}
+      app.kubernetes.io/name: {{ .Values.controlPlane.name }}
+    {{- if .Values.controlPlane.podLabels }}
+      {{ toYaml .Values.controlPlane.podLabels | nindent 6 }}
+    {{- end }}
   template:
     metadata:
       labels:
-        chart: {{ .Chart.Name }}-{{ .Chart.Version }}
-        {{- toYaml .Values.controlPlane.podLabels | nindent 8 }}
+        app.kubernetes.io/name: {{ .Values.controlPlane.name }}
+      {{- if .Values.controlPlane.podLabels }}
+        {{ toYaml .Values.controlPlane.podLabels | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: "{{ .Values.controlPlane.name }}-service-account"
+      {{- if .Values.controlPlane.securityContext }}
       securityContext:
-        {{- toYaml .Values.controlPlane.securityContext | nindent 8 }}
+        {{ toYaml .Values.controlPlane.securityContext | nindent 8 }}
+      {{- end }}
+      {{- if .Values.controlPlane.nodeSelector }}
       nodeSelector:
-        {{- toYaml .Values.controlPlane.nodeSelector | nindent 8 }}
+        {{ toYaml .Values.controlPlane.nodeSelector | nindent 8 }}
+      {{- end }}
+      {{- if .Values.controlPlane.affinity }}
       affinity:
-        {{- toYaml .Values.controlPlane.affinity | nindent 8 }}
+        {{ toYaml .Values.controlPlane.affinity | nindent 8 }}
+      {{- end }}
+      {{- if .Values.controlPlane.tolerations }}
       tolerations:
-        {{- toYaml .Values.controlPlane.tolerations | nindent 8 }}
+        {{ toYaml .Values.controlPlane.tolerations | nindent 8 }}
+      {{- end }}
+      {{- if .Values.controlPlane.image.pullSecrets }}
       imagePullSecrets:
-        {{- toYaml .Values.controlPlane.image.pullSecrets | nindent 8 }}
+        {{ toYaml .Values.controlPlane.image.pullSecrets | nindent 8 }}
+      {{- end }}
+      {{- if .Values.controlPlane.initContainers }}
       initContainers:
-        {{- toYaml .Values.controlPlane.initContainers | nindent 8 }}
+        {{ toYaml .Values.controlPlane.initContainers | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Values.controlPlane.name }}
           image: {{ .Values.controlPlane.image.name }}
           imagePullPolicy: {{ .Values.controlPlane.image.pullPolicy }}
-          command:
-            {{- toYaml .Values.controlPlane.command | nindent 12 }}
+          {{- if .Values.controlPlane.command }}
+          command:  
+            {{ toYaml .Values.controlPlane.command | nindent 12 }}
+          {{- end }}
+          {{- if .Values.controlPlane.env }}
           env:
-            {{- toYaml .Values.controlPlane.env | nindent 12 }}
+            {{ toYaml .Values.controlPlane.env | nindent 12 }}
+          {{- end }}
+          {{- if .Values.controlPlane.resources }}
           resources:
-            {{- toYaml .Values.controlPlane.resources | nindent 12 }}
-          {{- if .Values.privatePackage.enabled }}
-          ports:
-            - containerPort: {{ .Values.privatePackage.repository.server.port }}
+            {{ toYaml .Values.controlPlane.resources | nindent 12 }}
           {{- end }}
           volumeMounts:
             - mountPath: /app/conf/
               name: "{{ .Values.controlPlane.name }}-conf-volume"
-            {{- if .Values.privatePackage.enabled }}
+          {{- if .Values.privatePackage.enabled }}
             - mountPath: {{ .Values.privatePackage.repository.directory }}
               name: "{{ .Values.controlPlane.name }}-pv-volume"
-            {{- end }}
-            {{- toYaml .Values.controlPlane.volumeMounts | nindent 12 }}
+          {{- end }}
+          {{- if .Values.controlPlane.volumeMounts }}
+            {{ toYaml .Values.controlPlane.volumeMounts | nindent 12 }}
+          {{- end }}
       volumes:
         - name: "{{ .Values.controlPlane.name }}-conf-volume"
           configMap:
             name: "{{ .Values.controlPlane.name }}-config"
-        {{- if .Values.privatePackage.enabled }}
+      {{- if .Values.privatePackage.enabled }}
         - name: "{{ .Values.controlPlane.name }}-pv-volume"
           persistentVolumeClaim:
             claimName: "{{ .Values.controlPlane.name }}-pvc"
-        {{- end }}
-        {{- toYaml .Values.controlPlane.volumes | nindent 8 }}
-
+      {{- end }}
+      {{- if .Values.controlPlane.volumes }}
+        {{ toYaml .Values.controlPlane.volumes | nindent 8 }}
+      {{- end }}
diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
index e43ce5d..45dd69f 100644
--- a/helm-chart/values.yaml
+++ b/helm-chart/values.yaml
@@ -10,10 +10,8 @@ controlPlane:
     name: gatlingcorp/control-plane:latest
     pullPolicy: IfNotPresent
     pullSecrets: []
-  deploymentLabels:
-    app: gatling-cp-deploy
-  podLabels:
-    app: gatling-cp-pod
+  deploymentLabels: {}
+  podLabels: {}
   initContainers: []
   env: [] # Use KUBERNETES_TRUSTSTORE_FILE&KUBERNETES_TRUSTSTORE_PASSPHRASE/KUBERNETES_KEYSTORE_FILE&KUBERNETES_KEYSTORE_PASSPHRASE if custom truststore or keystore is needed to connect to the cluster via HTTPS.
   command: []
@@ -22,16 +20,14 @@ controlPlane:
   nodeSelector: {}
   affinity: {}
   tolerations: {}
-  #resources:
-    #requests:
-      #memory: "64Mi"
-      #cpu: "250m"
-    #limits:
-      #memory: "128Mi"
-      #cpu: "500m"
-  #securityContext:
-    #runAsUser: 1000
-    #runAsGroup: 3000
+  resources: 
+    requests:
+      memory: "64Mi"
+      cpu: "250m"
+    limits:
+      memory: "128Mi"
+      cpu: "500m"
+  securityContext: {}
   #extra_content: {}
 
 privateLocations: