fix(cf-common): revert pod annotations (#16)

* fix(cf-common): revert pod annotations

* empty commit

* fix tests

Author: mikhail-klimko

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

@@ -2,8 +2,11 @@
 suite: deployment metadata
 templates:
   - templates/controller.yaml
+  - templates/secret.yaml
+  - templates/configmap.yaml
 tests:
   - it: Test deployment default metadata
+    template: templates/controller.yaml
     values:
       - values.yaml
     asserts:
@@ -25,6 +28,7 @@ tests:
           value: RELEASE-NAME-cf-common-test
 
   - it: Test deployment custom metadata
+    template: templates/controller.yaml
     values:
       - values.yaml
     set:
@@ -52,6 +56,7 @@ tests:
             alice: bob
 
   - it: Test pod labels and annotations
+    template: templates/controller.yaml
     values:
       - values.yaml
     set:
@@ -72,7 +77,7 @@ tests:
       - values.yaml
     set:
       podAnnotations:
-        foo: bar
+        checksum/config: '{{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}'
       configMaps:
         config:
           enabled: true
@@ -82,15 +87,15 @@ tests:
       - equal:
           path: spec.template.metadata.annotations
           value:
-            foo: bar
-            checksum/config: 6d1644995a0e1ef705e43f2f737e6adea7036bfceb82cc3bf468cc411a0ff77b
+            checksum/config: de9d09f672fb2a4162f23792f202d4b078206a32d322d2b999fd822939397cb6
+        template: templates/controller.yaml
 
   - it: Test checksum/secret annotation
     values:
       - values.yaml
     set:
       podAnnotations:
-        foo: bar
+        checksum/secret: '{{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }}'
       secrets:
         secret:
           enabled: true
@@ -100,5 +105,5 @@ tests:
       - equal:
           path: spec.template.metadata.annotations
           value:
-            foo: bar
-            checksum/secret: 8de97c7e45c17e43f84a9bda5428fe0bdf0be8fe12b99cb928c95a01cacfb85f
+            checksum/secret: 22b7034621e9d062b0ca2a2d181ccaa21b537b480769384488b2e2b8d71e1cad
+        template: templates/controller.yaml

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

charts/cf-common/README.md

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

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

@@ -51,9 +51,9 @@ spec:
       {{- if .Values.podLabels }}
       {{- include "cf-common.tplrender" (dict "Values" .Values.podLabels "context" $) | nindent 8 }}
       {{- end }}
-      {{- with include "cf-common.annotations.podAnnotations" . }}
+      {{- if .Values.podAnnotations }}
       annotations:
-        {{- . | nindent 8}}
+      {{- include "cf-common.tplrender" (dict "Values" .Values.podAnnotations "context" $) | nindent 8 }}
       {{- end }}
     spec: {{- include "cf-common.controller.pod" . | trim | nindent 6 -}}
 {{- end -}}

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

@@ -38,7 +38,7 @@ spec:
   strategy:
     {{- if eq $strategy "Canary" }}
       {{- with .Values.controller.rollout.canary }}
-    canary: 
+    canary:
       maxUnavailable: {{ .maxUnavailable }}
       maxSurge: {{ .maxSurge }}
       stableMetadata: {{ .stableMetadata| toYaml | nindent 8 }}
@@ -52,9 +52,9 @@ spec:
       {{- if .Values.podLabels }}
       {{- include "cf-common.tplrender" (dict "Values" .Values.podLabels "context" $) | nindent 8 }}
       {{- end }}
-      {{- with include "cf-common.annotations.podAnnotations" . }}
+      {{- if .Values.podAnnotations }}
       annotations:
-        {{- . | nindent 8}}
+      {{- include "cf-common.tplrender" (dict "Values" .Values.podAnnotations "context" $) | nindent 8 }}
       {{- end }}
     spec: {{- include "cf-common.controller.pod" . | trim | nindent 6 -}}
 {{- end -}}