feat(cf-common): add nameOverride suffix (#22)

* feat(cf-common): add nameOverride suffix

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

charts/cf-common/README.md

@@ -2,7 +2,7 @@
 
 Codefresh library chart
 
-![Version: 0.0.20](https://img.shields.io/badge/Version-0.0.20-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.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)
 
 ## 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.20
+  version: 0.0.21
   repository: https://chartmuseum.codefresh.io/cf-common
 ```
 
@@ -75,6 +75,7 @@ dependencies:
 | controller.job.suspend | string | `nil` | Suspend specifies whether the Job controller should create Pods or not. (boolean) |
 | controller.job.ttlSecondsAfterFinished | string | `nil` | Set the limit on the lifetime of a Job that has finished execution (either Complete or Failed). (int) |
 | controller.labels | object | `{}` | Set labels on controller |
+| controller.nameOverride | string | `""` | Override the name suffix that is used for this controller |
 | controller.replicas | string | `nil` | Set number of pods |
 | controller.revisionHistoryLimit | string | `nil` | Set ReplicaSet revision history limit |
 | controller.rollout.analysis.successfulRunHistoryLimit | string | `nil` | Limits the number of successful analysis runs and experiments to be stored in a history |

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

@@ -8,7 +8,15 @@ Usage:
 
 {{- if .Values.controller.enabled -}}
 
-  {{ include "cf-common.controller.type" . }}
+  {{- $defaultControllerValues := deepCopy .Values.controller -}}
+  {{- $globalControllerValues := dict -}}
+  {{- if .Values.global -}}
+    {{- if .Values.global.controller -}}
+      {{- $globalControllerValues = deepCopy .Values.global.controller -}}
+    {{- end -}}
+  {{- end -}}
+  {{- $mergedControllerValues := mergeOverwrite $globalControllerValues $defaultControllerValues -}}
+  {{- $_ := set .Values "controller" (deepCopy $mergedControllerValues) -}}
 
   {{- if eq .Values.controller.type "rollout" }}
     {{ include "cf-common.controller.rollout" . | nindent 0 }}
@@ -25,22 +33,3 @@ Usage:
 {{- 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/controller/_deployment.tpl

@@ -12,11 +12,16 @@ Usage:
   {{- fail (printf "ERROR: %s is invalid Deployment strategy!" $strategy) -}}
 {{- end -}}
 
+{{- $deploymentName := include "cf-common.names.fullname" . -}}
+{{- if and (hasKey .Values.controller "nameOverride") .Values.controller.nameOverride -}}
+  {{- $deploymentName = printf "%v-%v" $deploymentName .Values.controller.nameOverride -}}
+{{- end -}}
+
 ---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "cf-common.names.fullname" . }}
+  name: {{ $deploymentName }}
   labels: {{ include "cf-common.labels.standard" . | nindent 4 }}
   {{- if .Values.controller.labels }}
   {{- include "cf-common.tplrender" (dict "Values" .Values.controller.labels "context" $) | nindent 4 }}

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

@@ -12,11 +12,16 @@ Usage:
   {{- fail (printf "ERROR: %s is invalid Rollout strategy!" $strategy) -}}
 {{- end -}}
 
+{{- $rolloutName := include "cf-common.names.fullname" . -}}
+{{- if and (hasKey .Values.controller "nameOverride") .Values.controller.nameOverride -}}
+  {{- $rolloutName = printf "%v-%v" $rolloutName .Values.controller.nameOverride -}}
+{{- end -}}
+
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Rollout
 metadata:
-  name: {{ include "cf-common.names.fullname" . }}
+  name: {{ $rolloutName }}
   labels: {{ include "cf-common.labels.standard" . | nindent 4 }}
   {{- if .Values.controller.labels }}
   {{- include "cf-common.tplrender" (dict "Values" .Values.controller.labels "context" $) | nindent 4 }}
@@ -38,7 +43,7 @@ spec:
   strategy:
     {{- if eq $strategy "Canary" }}
       {{- with .Values.controller.rollout }}
-    canary: 
+    canary:
       maxUnavailable: {{ .canary.maxUnavailable }}
       maxSurge: {{ .canary.maxSurge }}
       stableMetadata: {{ .canary.stableMetadata| toYaml | nindent 8 }}

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

@@ -8,7 +8,15 @@ Usage:
 
 {{- if .Values.hpa.enabled -}}
 
-{{ include "cf-common.controller.type" . }}
+{{- $defaultControllerValues := deepCopy .Values.controller -}}
+{{- $globalControllerValues := dict -}}
+{{- if .Values.global -}}
+  {{- if .Values.global.controller -}}
+    {{- $globalControllerValues = deepCopy .Values.global.controller -}}
+  {{- end -}}
+{{- end -}}
+{{- $mergedControllerValues := mergeOverwrite $globalControllerValues $defaultControllerValues -}}
+{{- $_ := set .Values "controller" (deepCopy $mergedControllerValues) -}}
 
 apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler

charts/cf-common/values.yaml

@@ -83,6 +83,8 @@ controller:
   labels: {}
   # -- Set annotations on controller
   annotations: {}
+  # -- Override the name suffix that is used for this controller
+  nameOverride: ""
   # -- Set number of pods
   replicas:
   # -- Set ReplicaSet revision history limit