feat(cf-common): add extra volumes and volumeMounts from globals (#23)

* feat(cf-common):  add extra volumes and volumeMounts from globals

* tests

Author: mikhail-klimko

charts/cf-common-test/tests/deployment/volumes_test.yaml

@@ -41,3 +41,84 @@ tests:
     asserts:
       - failedTemplate:
           errorMessage: "something is invalid volume type for volume my-volume!"
+
+  - it: Test volumes and volumeMounts from global
+    values:
+      - values.yaml
+    set:
+      global:
+        volumes:
+          global-ca-cert:
+            enabled: true
+            type: secret
+            existingName: my-global-ca-cert-secret
+            optional: true
+        container:
+          volumeMounts:
+            global-ca-cert:
+              path:
+              - mountPath: /etc/ssl/ca.pem
+                subPath: ca.pem
+                readOnly: true
+    asserts:
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: global-ca-cert
+            secret:
+              secretName: my-global-ca-cert-secret
+              optional: true
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: global-ca-cert
+            mountPath: /etc/ssl/ca.pem
+            subPath: ca.pem
+            readOnly: true
+
+  - it: Test merge volumes and volumeMounts with global
+    values:
+      - values.yaml
+    set:
+      global:
+        volumes:
+          ca-cert:
+            enabled: true
+            type: secret
+            existingName: GLOBAL-ca-cert-secret
+            optional: true
+        container:
+          volumeMounts:
+            ca-cert:
+              path:
+              - mountPath: /etc/ssl/global/ca.pem
+                subPath: ca.pem
+                readOnly: true
+      volumes:
+        ca-cert:
+          enabled: true
+          type: secret
+          existingName: DEFAULT-ca-cert-secret
+          optional: true
+      container:
+        volumeMounts:
+          ca-cert:
+            path:
+            - mountPath: /etc/ssl/default/ca.pem
+              subPath: ca.pem
+              readOnly: true
+    asserts:
+      - contains:
+          path: spec.template.spec.volumes
+          content:
+            name: ca-cert
+            secret:
+              secretName: DEFAULT-ca-cert-secret
+              optional: true
+      - contains:
+          path: spec.template.spec.containers[0].volumeMounts
+          content:
+            name: ca-cert
+            mountPath: /etc/ssl/default/ca.pem
+            subPath: ca.pem
+            readOnly: true

charts/cf-common/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v0.0.0
 description: Codefresh library chart
 name: cf-common
-version: 0.0.21
+version: 0.0.22
 type: library
 keywords:
   - codefresh

charts/cf-common/README.md

@@ -2,7 +2,7 @@
 
 Codefresh library chart
 
-![Version: 0.0.21](https://img.shields.io/badge/Version-0.0.21-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
+![Version: 0.0.22](https://img.shields.io/badge/Version-0.0.22-informational?style=flat-square) ![Type: library](https://img.shields.io/badge/Type-library-informational?style=flat-square) ![AppVersion: v0.0.0](https://img.shields.io/badge/AppVersion-v0.0.0-informational?style=flat-square)
 
 ## Installing the Chart
 
@@ -18,7 +18,7 @@ Include this chart as a dependency in your `Chart.yaml` e.g.
 # Chart.yaml
 dependencies:
 - name: cf-common
-  version: 0.0.21
+  version: 0.0.22
   repository: https://chartmuseum.codefresh.io/cf-common
 ```
 

charts/cf-common/templates/container/_container.tpl

@@ -73,7 +73,7 @@ For backward compatibility (.Values.env takes precedence over .Values.container.
 
   {{- with .Values.volumeMounts }}
   volumeMounts:
-  {{- include "cf-common.volumeMounts" . | trim | nindent 2 }}
+  {{- include "cf-common.volumeMounts" (dict "Values" . "context" $) | trim | nindent 2 }}
   {{- end }}
 
   {{- with .Values.probes }}

charts/cf-common/templates/container/_volumemounts.tpl

@@ -3,13 +3,30 @@ Renders volumeMounts list in container
 Usage:
   {{- with .Values.volumeMounts }}
   volumeMounts:
-  {{- include "cf-common.volumeMounts" . | trim | nindent 2 }}
+  {{- include "cf-common.volumeMounts" (dict "Values" . "context" $) | trim | nindent 2 }}
   {{- end }}
 */}}
 
 {{- define "cf-common.volumeMounts" -}}
+{{/* Restoring root $ context */}}
+{{- $ := .context -}}
 
-{{- range $mountIndex, $mountItem := . }}
+{{- $defaultVolumeMounts := dict -}}
+{{- $globalVolumeMounts := dict -}}
+
+{{- if .Values -}}
+  {{- $defaultVolumeMounts = deepCopy .Values -}}
+{{- end -}}
+{{- if $.Values.global -}}
+  {{- if $.Values.global.container -}}
+    {{- if $.Values.global.container.volumeMounts -}}
+      {{- $globalVolumeMounts = deepCopy $.Values.global.container.volumeMounts -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+{{- $mergedVolumeMounts := mergeOverwrite $globalVolumeMounts $defaultVolumeMounts -}}
+
+{{- range $mountIndex, $mountItem := $mergedVolumeMounts }}
 
 {{- if not (kindIs "slice" $mountItem.path) }}
   {{ fail (printf "ERROR: volumeMounts.%s.path block must be a list!" $mountIndex ) }}

charts/cf-common/templates/controller/_volumes.tpl

@@ -1,18 +1,30 @@
 {{/*
 Renders volumes in controller template
-
 Usage:
-volumes:
-{{ include "cf-common.volumes" (dict "Values" .Values.volumes "context" $) }}
-{{ include "cf-common.volumes" (dict "Values" .Values.existingVolumes "context" $) }}
+  {{- with .Values.volumes }}
+  volumes:
+  {{ include "cf-common.volumes" (dict "Values" . "context" $) | trim }}
+  {{- end }}
 */}}
 
-{{- define "cf-common.volumes" }}
-
+{{- define "cf-common.volumes" -}}
 {{/* Restoring root $ context */}}
 {{- $ := .context -}}
 
-{{- range $volumeIndex, $volumeItem := .Values }}
+{{- $defaultVolumes := dict -}}
+{{- $globalVolumes := dict -}}
+
+{{- if .Values -}}
+  {{- $defaultVolumes = deepCopy .Values -}}
+{{- end -}}
+{{- if $.Values.global -}}
+  {{- if $.Values.global.volumes -}}
+    {{- $globalVolumes = deepCopy $.Values.global.volumes -}}
+  {{- end -}}
+{{- end -}}
+{{- $mergedVolumes := mergeOverwrite $globalVolumes $defaultVolumes -}}
+
+{{- range $volumeIndex, $volumeItem := $mergedVolumes }}
 
 {{- if $volumeItem.enabled }}
 - name: {{ $volumeIndex }}
@@ -53,4 +65,4 @@ volumes:
 
 {{- end }}
 
-{{- end }}
+{{- end -}}