Merge pull request #101 from dasmeta/DMVP-4118

fix(DMVP-4118): Change job labels

charts/base/Chart.yaml

@@ -15,10 +15,10 @@ 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.1.63
+version: 0.1.64
 
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.1.63"
+appVersion: "0.1.64"

charts/base/README.md

@@ -501,6 +501,10 @@ base:
       repository: ********.dkr.ecr.eu-central-1.amazonaws.com/
       tag: latest
       pullPolicy: IfNotPresent
+   labels:
+     label1:
+       name: "app-version"
+       value: "v1.0.19"
     volumes:
     - name: storage
       mountPath: /opt/storage/

charts/base/templates/job.yml

@@ -5,8 +5,8 @@ metadata:
   name: {{ .Values.job.name | default (include "base.fullname" .) }}
   labels:
     {{- include "base.labels" . | nindent 4 }}
-    {{- if .Values.labels }}
-    {{- range $key, $value := .Values.labels }}
+    {{- if .Values.job.labels }}
+    {{- range $key, $value := .Values.job.labels }}
     {{ $value.name }}: {{ $value.value | quote}}
     {{- end }}
     {{- end }}
@@ -24,8 +24,8 @@ spec:
       {{- end }}
       labels:
         {{- include "base.selectorLabels" . | nindent 8 }}
-        {{- if .Values.labels }}
-        {{- range $key, $value := .Values.labels }}
+        {{- if .Values.job.labels }}
+        {{- range $key, $value := .Values.job.labels }}
         {{ $value.name }}: {{ $value.value | quote }}
         {{- end }}
         {{- end }}