feat(cf-common): create controller-type tpl (#19)

Author: mikhail-klimko

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

charts/cf-common/README.md

@@ -2,7 +2,7 @@
 
 Codefresh library chart
 
-![Version: 0.0.17](https://img.shields.io/badge/Version-0.0.17-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.18](https://img.shields.io/badge/Version-0.0.18-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.17
+  version: 0.0.18
   repository: https://chartmuseum.codefresh.io/cf-common
 ```
 
@@ -149,6 +149,7 @@ dependencies:
 | serviceAccount.annotations | object | `{}` | Set annotations for Service Account |
 | serviceAccount.enabled | bool | `false` | Enable and create Service Account |
 | serviceAccount.nameOverride | string | `""` | Override Service Account name (by default, name is generated with `fullname` template) |
+| terminationGracePeriodSeconds | string | `nil` | Duration in seconds the pod needs to terminate gracefully |
 | tolerations | list | `[]` | Set tolerations constrains |
 | topologySpreadConstraints | list | `[]` | Set topologySpreadConstraints rules. Helm template supported. Passed through `tpl`, should be configured as string |
 | volumes | object | See below | Configure volume for the controller. Additional items can be added by adding a dictionary key similar to the 'config'/`secret` key. |

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

@@ -2,30 +2,42 @@
 Renders contoller object
 Usage:
 {{- include "cf-common.controller" . -}}
-{{ .Values.controller | mustToPrettyJson | fail }}
 */}}
 
 {{- define "cf-common.controller" -}}
 
 {{- if .Values.controller.enabled -}}
 
-  {{- $controllerDict := .Values.controller -}}
-  {{- if .Values.global -}}
-    {{- if .Values.global.controller -}}
-      {{- $controllerDict = merge $controllerDict .Values.global.controller -}}
-    {{- end -}}
-  {{- end -}}
-  {{- $_ := set .Values "controller" $controllerDict -}}
+  {{ include "cf-common.controller.type" . }}
 
-  {{- if eq $controllerDict.type "rollout" }}
+  {{- if eq .Values.controller.type "rollout" }}
     {{ include "cf-common.controller.rollout" . | nindent 0 }}
-  {{- else if eq $controllerDict.type "deployment" }}
+  {{- else if eq .Values.controller.type "deployment" }}
     {{ include "cf-common.controller.deployment" . | nindent 0 }}
-  {{- else if eq $controllerDict.type "job" }}
+  {{- else if eq .Values.controller.type "job" }}
     {{ include "cf-common.controller.job" . | nindent 0 }}
   {{- else }}
     {{ fail (printf "ERROR: %s is invalid controller type!" .Values.controller.type) }}
   {{- end }}
 {{- end -}}
 
 {{- end -}}
+
+
+{{- /*
+Define controller type. Merges .Values.controller (takes precedence) with .Values.global.controller
+Usage:
+{{ include "cf-common.controller.type" . }}
+*/}}
+
+{{- define "cf-common.controller.type" }}
+
+  {{- $controllerDict := .Values.controller -}}
+  {{- if .Values.global -}}
+    {{- if .Values.global.controller -}}
+      {{- $controllerDict = merge $controllerDict .Values.global.controller -}}
+    {{- end -}}
+  {{- end -}}
+  {{- $_ := set .Values "controller" $controllerDict -}}
+
+{{- end }}

charts/cf-common/templates/render/_hpa.tpl

@@ -8,6 +8,8 @@ Usage:
 
 {{- if .Values.hpa.enabled -}}
 
+{{ include "cf-common.controller.type" . }}
+
 apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:

charts/cf-common/values.yaml

@@ -129,6 +129,9 @@ podLabels: {}
 # -- Set additional pod annotations
 podAnnotations: {}
 
+# -- Duration in seconds the pod needs to terminate gracefully
+terminationGracePeriodSeconds:
+
 # -- Main Container parameters
 # @default -- See below
 container: