feat(cf-common): upd image.tpl for backward compatibility (#6)

* feat(cf-common): upd image.tpl for backward compatibility

* wrap imagePullSecrets in tpl

* add tests

Author: mikhail-klimko

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

@@ -234,3 +234,16 @@ tests:
       - equal:
           path: spec.template.spec.containers[0].image
           value: myregistry.io/codefresh/cf-api:master
+
+  # For backward compatibility (onprem with private docker registry)
+  - it: Test main container with legacy var structure for image
+    values:
+      - values.yaml
+    set:
+      image: codefresh/cf-api
+      dockerRegistry: gcr.io/codefresh-enterprise/
+      imageTag: latest
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].image
+          value: gcr.io/codefresh-enterprise/codefresh/cf-api:latest

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

@@ -48,6 +48,22 @@ tests:
           path: spec.template.spec.imagePullSecrets
           count: 2
 
+  - it: Test deployment TPL imagePullSecrets
+    release:
+      name: cf
+    values:
+      - values.yaml
+    set:
+      global:
+        pullSecretName: ecr-codefresh
+      imagePullSecrets:
+        - "{{ .Release.Name }}-{{ .Values.global.pullSecretName }}-registry"
+    asserts:
+      - contains:
+          path: spec.template.spec.imagePullSecrets
+          content:
+            name: cf-ecr-codefresh-registry
+
   - it: Test deployment's initContainer is present and valid
     values:
       - values.yaml

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

@@ -4,7 +4,6 @@ global:
     - global-pull-secret
   volumeName: some-existing-volume
 
-
 imagePullSecrets:
   - my-pull-secret
 

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.5
+version: 0.0.6
 type: library
 keywords:
   - codefresh

charts/cf-common/README.md

@@ -2,7 +2,7 @@
 
 Codefresh library chart
 
-![Version: 0.0.5](https://img.shields.io/badge/Version-0.0.5-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.6](https://img.shields.io/badge/Version-0.0.6-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.5
+  version: 0.0.6
   repository: https://chartmuseum.codefresh.io/cf-common
 ```
 

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

@@ -27,6 +27,25 @@ For backward compatibility (onprem with private docker registry)
   {{- end -}}
 {{- end -}}
 
+{{- /*
+For backward compatibility with legacy var struct
+e.g.:
+cf-api:
+  enabled: true
+  image: codefresh/cf-api
+  dockerRegistry: gcr.io/codefresh-enterprise/
+  imageTag: latest
+*/}}
+{{- if $.Values.dockerRegistry -}}
+{{- $registryName = $.Values.dockerRegistry | trimSuffix "/" -}}
+{{- end -}}
+{{- if $.Values.image -}}
+{{- $repositoryName = $.Values.image -}}
+{{- end -}}
+{{- if $.Values.imageTag -}}
+{{- $imageTag = $.Values.imageTag | toString -}}
+{{- end -}}
+
 {{- printf "%s/%s:%s" $registryName $repositoryName $imageTag -}}
 
 {{- end -}}
@@ -46,7 +65,7 @@ Usage:
     {{- end -}}
 
     {{- range .Values.global.imagePullSecrets -}}
-      {{- $pullSecrets = append $pullSecrets . -}}
+      {{- $pullSecrets = append $pullSecrets (include "cf-common.tplrender" (dict "Values" . "context" $)) -}}
     {{- end -}}
   {{- end -}}
 
@@ -56,7 +75,7 @@ Usage:
     {{- end -}}
 
     {{- range .Values.imagePullSecrets -}}
-      {{- $pullSecrets = append $pullSecrets . -}}
+      {{- $pullSecrets = append $pullSecrets (include "cf-common.tplrender" (dict "Values" . "context" $)) -}}
     {{- end -}}
   {{- end -}}