The next release version will be 0.62.0

* allow file configmap on cron-job chart

* Allow disabling the command override in cronjob container

* Use name of volume instead of fileName for configmap naming

* Add YAML separator to configmaps to allow multiple configmap volumes

- before this change if you tried to use e.g. multiple file configmaps they would all be appended in one YAML file due to no usage of separators, which would lead to only one of the file confimaps actually be created.

* Fix broken test due to file configmap naming change

charts/common/templates/_configmap.yaml

@@ -1,5 +1,6 @@
 {{- define "common.configmap.tpl" -}}
 {{- if .Values.vars }}
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:

charts/common/templates/_customFileConfigmap.yaml

@@ -1,11 +1,11 @@
 {{- define "common.customFileConfigmap.tpl" -}}
 {{- range .Values.volumes }}
   {{- if .fileName }}
-
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "common.robustName" .fileName }}
+  name: {{ template "common.robustName" (printf "%s-%s" $.Release.Name .name) }}
   namespace: {{ $.Release.Namespace }}
 data:
   {{ .fileName }}: |

charts/common/templates/_volumesRef.yaml

@@ -10,7 +10,7 @@ volumes:
       name: {{ .existingConfigMap }}
     {{- else if .fileName }}
     configMap:
-      name: {{ template "common.robustName" .fileName }}
+      name: {{ template "common.robustName" (printf "%s-%s" $.Release.Name .name) }}
     {{- else if .hostPath }}
     hostPath:
       path: {{ .hostPath.path }}

charts/cron-job/Chart.yaml

@@ -15,7 +15,7 @@ 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.59.0
+version: 0.62.0
 
 dependencies:
   - name: common

charts/cron-job/templates/cronJob.yaml

@@ -25,10 +25,12 @@ spec:
               {{- if .Values.vars }}
               imagePullPolicy: {{ .Values.image.pullPolicy }}
               {{- end }}
+              {{- if .Values.overrideCommand }}
               command:
                 - {{ .Values.shell }}
                 - -c
                 - {{ .Values.command | quote }}
+              {{- end }}
               {{- include "common.envFromRef.tpl" . | nindent 14 }}
               {{- include "common.volumeMountsRef.tpl" . | nindent 14 }}
               resources:

charts/cron-job/templates/custom-file-configmap.yaml

@@ -0,0 +1 @@
+{{- include "common.customFileConfigmap.tpl" . -}}

charts/cron-job/values.yaml

@@ -5,6 +5,7 @@ image:
 schedule: "*/1 * * * *"
 command: |
   echo "I'm alive"
+overrideCommand: true
 shell: "/bin/sh"
 
 nameOverride: ""

charts/onechart/Chart.yaml

@@ -15,7 +15,7 @@ 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.59.0
+version: 0.62.0
 
 dependencies:
   - name: common

charts/onechart/templates/service.yaml

@@ -10,39 +10,39 @@ metadata:
     {{- if .Values.gitRepository }}
     gimlet.io/git-repository: {{ .Values.gitRepository }}
     {{- $parts := split "/" .Values.gitRepository }}
-    opensca.dev/v0.1.0/vcs/owner: {{ $parts._0 }}
-    opensca.dev/v0.1.0/vcs/name: {{ $parts._1 }}
+    v1alpha1.opensca.dev/vcs.owner: {{ $parts._0 }}
+    v1alpha1.opensca.dev/vcs.name: {{ $parts._1 }}
     {{- end }}
     {{- if .Values.gitSha }}
     gimlet.io/git-sha: {{ .Values.gitSha }}
-    opensca.dev/v0.1.0/version/sha: {{ .Values.gitSha }}
+    v1alpha1.opensca.dev/version.sha: {{ .Values.gitSha }}
     {{- end }}
     {{- if .Values.serviceName }}
-    opensca.dev/v0.1.0/name: {{ .Values.serviceName | quote }}
+    v1alpha1.opensca.dev/name: {{ .Values.serviceName | quote }}
     {{- end }}
     {{- if .Values.serviceDescription }}
-    opensca.dev/v0.1.0/description: {{ .Values.serviceDescription | quote }}
+    v1alpha1.opensca.dev/description: {{ .Values.serviceDescription | quote }}
     {{- end }}
     {{- if .Values.ownerName }}
-    opensca.dev/v0.1.0/owner/name: {{ .Values.ownerName | quote }}
+    v1alpha1.opensca.dev/owner.name: {{ .Values.ownerName | quote }}
     {{- end }}
     {{- if .Values.ownerIm }}
-    opensca.dev/v0.1.0/owner/im: {{ .Values.ownerIm | quote }}
+    v1alpha1.opensca.dev/owner.im: {{ .Values.ownerIm | quote }}
     {{- end }}
     {{- if .Values.documentation }}
-    opensca.dev/v0.1.0/documentation: {{ .Values.documentation | quote }}
+    v1alpha1.opensca.dev/documentation: {{ .Values.documentation | quote }}
     {{- end }}
     {{- if .Values.logs }}
-    opensca.dev/v0.1.0/logs: {{ .Values.logs | quote }}
+    v1alpha1.opensca.dev/logs: {{ .Values.logs | quote }}
     {{- end }}
     {{- if .Values.metrics }}
-    opensca.dev/v0.1.0/metrics: {{ .Values.metrics | quote }}
+    v1alpha1.opensca.dev/metrics: {{ .Values.metrics | quote }}
     {{- end }}
     {{- if .Values.issues }}
-    opensca.dev/v0.1.0/issues: {{ .Values.issues | quote }}
+    v1alpha1.opensca.dev/issues: {{ .Values.issues | quote }}
     {{- end }}
     {{- if .Values.traces }}
-    opensca.dev/v0.1.0/traces: {{ .Values.traces | quote }}
+    v1alpha1.opensca.dev/traces: {{ .Values.traces | quote }}
     {{- end }}
   {{- end }}
 spec:

charts/onechart/tests/deployment_volumes_test.yaml

@@ -169,7 +169,7 @@ tests:
           value:
             - name: volume-name
               configMap:
-                name: myfile-conf
+                name: release-name-volume-name
       - equal:
           path: spec.template.spec.containers[0].volumeMounts
           value:

charts/onechart/tests/service_taxonomy_test.yaml

@@ -21,15 +21,15 @@ tests:
           value:
             gimlet.io/git-repository: laszlocph/demo-app
             gimlet.io/git-sha: xyz
-            opensca.dev/v0.1.0/vcs/owner: laszlocph
-            opensca.dev/v0.1.0/vcs/name: demo-app
-            opensca.dev/v0.1.0/version/sha: xyz
-            opensca.dev/v0.1.0/name: cart-backend
-            opensca.dev/v0.1.0/description: "Backend to manage shopping cart state, written in Go"
-            opensca.dev/v0.1.0/owner/name: "backend-team"
-            opensca.dev/v0.1.0/owner/im: "#backend-team"
-            opensca.dev/v0.1.0/documentation: https://confluence.mycompany.com/cart-backend
-            opensca.dev/v0.1.0/logs: https://grafana.mycompany.com/logs
-            opensca.dev/v0.1.0/metrics: https://grafana.mycompany.com/cart-dashboard
-            opensca.dev/v0.1.0/issues: https://jira.mycompany.com/cart-backend
-            opensca.dev/v0.1.0/traces: https://jaeger.mycompany.com/cart-dashboard
+            v1alpha1.opensca.dev/vcs.owner: laszlocph
+            v1alpha1.opensca.dev/vcs.name: demo-app
+            v1alpha1.opensca.dev/version.sha: xyz
+            v1alpha1.opensca.dev/name: cart-backend
+            v1alpha1.opensca.dev/description: "Backend to manage shopping cart state, written in Go"
+            v1alpha1.opensca.dev/owner.name: "backend-team"
+            v1alpha1.opensca.dev/owner.im: "#backend-team"
+            v1alpha1.opensca.dev/documentation: https://confluence.mycompany.com/cart-backend
+            v1alpha1.opensca.dev/logs: https://grafana.mycompany.com/logs
+            v1alpha1.opensca.dev/metrics: https://grafana.mycompany.com/cart-dashboard
+            v1alpha1.opensca.dev/issues: https://jira.mycompany.com/cart-backend
+            v1alpha1.opensca.dev/traces: https://jaeger.mycompany.com/cart-dashboard

charts/static-site/Chart.yaml

@@ -14,5 +14,5 @@ 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.59.0
+version: 0.62.0