diff --git a/charts/cf-common-test/tests/deployment/container_test.yaml b/charts/cf-common-test/tests/deployment/container_test.yaml index 8c2bff3..cdf319d 100644 --- a/charts/cf-common-test/tests/deployment/container_test.yaml +++ b/charts/cf-common-test/tests/deployment/container_test.yaml @@ -43,6 +43,18 @@ tests: path: spec.template.spec.containers[0].image value: 839151377425.dkr.ecr.us-east-1.amazonaws.com/codefresh-inc/codefresh/cf-api:master + - it: Test main container image with empty registry set + set: + container: + image: + registry: "" + repository: example.com/codefresh-inc/codefresh/cf-api + tag: master + asserts: + - equal: + path: spec.template.spec.containers[0].image + value: example.com/codefresh-inc/codefresh/cf-api:master + - it: Test main container imagePullPolicy asserts: - equal: diff --git a/charts/cf-common/Chart.yaml b/charts/cf-common/Chart.yaml index c7b3389..ba17b2f 100644 --- a/charts/cf-common/Chart.yaml +++ b/charts/cf-common/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v0.0.0 description: Codefresh library chart name: cf-common -version: 0.18.0 +version: 0.18.1 type: library keywords: - codefresh diff --git a/charts/cf-common/README.md b/charts/cf-common/README.md index a558fea..1ca4576 100644 --- a/charts/cf-common/README.md +++ b/charts/cf-common/README.md @@ -2,7 +2,7 @@ Codefresh library chart -![Version: 0.18.0](https://img.shields.io/badge/Version-0.18.0-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.18.1](https://img.shields.io/badge/Version-0.18.1-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.18.0 + version: 0.18.1 repository: https://chartmuseum.codefresh.io/cf-common ``` diff --git a/charts/cf-common/templates/classic/_env_var_secret_ref.tpl b/charts/cf-common/templates/classic/_env_var_secret_ref.tpl index ee567a5..0031311 100644 --- a/charts/cf-common/templates/classic/_env_var_secret_ref.tpl +++ b/charts/cf-common/templates/classic/_env_var_secret_ref.tpl @@ -1,18 +1,18 @@ {{- /* MONGODB_HOST env var secret name */}} -{{- define "cf-common-0.18.0.classic.mongodb-host-env-var-secret-name" }} +{{- define "cf-common-0.18.1.classic.mongodb-host-env-var-secret-name" }} {{- if or .Values.mongodbHostSecretKeyRef .Values.global.mongodbHostSecretKeyRef }} {{- printf (coalesce .Values.mongodbHostSecretKeyRef.name .Values.global.mongodbHostSecretKeyRef.name) }} {{- else }} -{{- printf "%s-%s" (include "cf-common-0.18.0.names.fullname" .) "secret" }} +{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }} {{- end }} {{- end }} {{- /* MONGODB_HOST env var secret key */}} -{{- define "cf-common-0.18.0.classic.mongodb-host-env-var-secret-key" }} +{{- define "cf-common-0.18.1.classic.mongodb-host-env-var-secret-key" }} {{- if or .Values.mongodbHostSecretKeyRef .Values.global.mongodbHostSecretKeyRef }} {{- printf (coalesce .Values.mongodbHostSecretKeyRef.key .Values.global.mongodbHostSecretKeyRef.key) }} {{- else }} @@ -23,18 +23,18 @@ MONGODB_HOST env var secret key {{- /* MONGODB_USER env var secret name */}} -{{- define "cf-common-0.18.0.classic.mongodb-user-env-var-secret-name" }} +{{- define "cf-common-0.18.1.classic.mongodb-user-env-var-secret-name" }} {{- if or .Values.mongodbUserSecretKeyRef .Values.global.mongodbUserSecretKeyRef }} {{- printf (coalesce .Values.mongodbUserSecretKeyRef.name .Values.global.mongodbUserSecretKeyRef.name) }} {{- else }} -{{- printf "%s-%s" (include "cf-common-0.18.0.names.fullname" .) "secret" }} +{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }} {{- end }} {{- end }} {{- /* MONGODB_USER env var secret key */}} -{{- define "cf-common-0.18.0.classic.mongodb-user-env-var-secret-key" }} +{{- define "cf-common-0.18.1.classic.mongodb-user-env-var-secret-key" }} {{- if or .Values.mongodbUserSecretKeyRef .Values.global.mongodbUserSecretKeyRef }} {{- printf (coalesce .Values.mongodbUserSecretKeyRef.key .Values.global.mongodbUserSecretKeyRef.key) }} {{- else }} @@ -45,18 +45,18 @@ MONGODB_USER env var secret key {{- /* MONGODB_PASSWORD env var secret name */}} -{{- define "cf-common-0.18.0.classic.mongodb-password-env-var-secret-name" }} +{{- define "cf-common-0.18.1.classic.mongodb-password-env-var-secret-name" }} {{- if or .Values.mongodbPasswordSecretKeyRef .Values.global.mongodbPasswordSecretKeyRef }} {{- printf (coalesce .Values.mongodbPasswordSecretKeyRef.name .Values.global.mongodbPasswordSecretKeyRef.name) }} {{- else }} -{{- printf "%s-%s" (include "cf-common-0.18.0.names.fullname" .) "secret" }} +{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }} {{- end }} {{- end }} {{- /* MONGODB_PASSWORD env var secret key */}} -{{- define "cf-common-0.18.0.classic.mongodb-password-env-var-secret-key" }} +{{- define "cf-common-0.18.1.classic.mongodb-password-env-var-secret-key" }} {{- if or .Values.mongodbPasswordSecretKeyRef .Values.global.mongodbPasswordSecretKeyRef }} {{- printf (coalesce .Values.mongodbPasswordSecretKeyRef.key .Values.global.mongodbPasswordSecretKeyRef.key) }} {{- else }} @@ -67,7 +67,7 @@ MONGODB_PASSWORD env var secret key {{- /* MONGO_URI env var value */}} -{{- define "cf-common-0.18.0.classic.mongo-uri-env-var-value" }} +{{- define "cf-common-0.18.1.classic.mongo-uri-env-var-value" }} {{- /* Check for legacy global.mongoURI */}} @@ -84,18 +84,18 @@ New secret implementation {{- /* REDIS_URL env var secret name */}} -{{- define "cf-common-0.18.0.classic.redis-url-env-var-secret-name" }} +{{- define "cf-common-0.18.1.classic.redis-url-env-var-secret-name" }} {{- if or .Values.redisUrlSecretKeyRef .Values.global.redisUrlSecretKeyRef }} {{- printf (coalesce .Values.redisUrlSecretKeyRef.name .Values.global.redisUrlSecretKeyRef.name) }} {{- else }} -{{- printf "%s-%s" (include "cf-common-0.18.0.names.fullname" .) "secret" }} +{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }} {{- end }} {{- end }} {{- /* REDIS_URL env var secret key */}} -{{- define "cf-common-0.18.0.classic.redis-url-env-var-secret-key" }} +{{- define "cf-common-0.18.1.classic.redis-url-env-var-secret-key" }} {{- if or .Values.redisUrlSecretKeyRef .Values.global.redisUrlSecretKeyRef }} {{- printf (coalesce .Values.redisUrlSecretKeyRef.key .Values.global.redisUrlSecretKeyRef.key) }} {{- else }} @@ -106,18 +106,18 @@ REDIS_URL env var secret key {{- /* REDIS_PASSWORD env var secret name */}} -{{- define "cf-common-0.18.0.classic.redis-password-env-var-secret-name" }} +{{- define "cf-common-0.18.1.classic.redis-password-env-var-secret-name" }} {{- if or .Values.redisPasswordSecretKeyRef .Values.global.redisPasswordSecretKeyRef }} {{- printf (coalesce .Values.redisPasswordSecretKeyRef.name .Values.global.redisPasswordSecretKeyRef.name) }} {{- else }} -{{- printf "%s-%s" (include "cf-common-0.18.0.names.fullname" .) "secret" }} +{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }} {{- end }} {{- end }} {{- /* REDIS_PASSWORD env var secret key */}} -{{- define "cf-common-0.18.0.classic.redis-password-env-var-secret-key" }} +{{- define "cf-common-0.18.1.classic.redis-password-env-var-secret-key" }} {{- if or .Values.redisPasswordSecretKeyRef .Values.global.redisPasswordSecretKeyRef }} {{- printf (coalesce .Values.redisPasswordSecretKeyRef.key .Values.global.redisPasswordSecretKeyRef.key) }} {{- else }} @@ -128,18 +128,18 @@ REDIS_PASSWORD env var secret key {{- /* POSTGRES_HOSTNAME env var secret name */}} -{{- define "cf-common-0.18.0.classic.postgres-hostname-env-var-secret-name" }} +{{- define "cf-common-0.18.1.classic.postgres-hostname-env-var-secret-name" }} {{- if or .Values.postgresHostnameSecretKeyRef .Values.global.postgresHostnameSecretKeyRef }} {{- printf (coalesce .Values.postgresHostnameSecretKeyRef.name .Values.global.postgresHostnameSecretKeyRef.name) }} {{- else }} -{{- printf "%s-%s" (include "cf-common-0.18.0.names.fullname" .) "secret" }} +{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }} {{- end }} {{- end }} {{- /* POSTGRES_HOSTNAME env var secret key */}} -{{- define "cf-common-0.18.0.classic.postgres-hostname-env-var-secret-key" }} +{{- define "cf-common-0.18.1.classic.postgres-hostname-env-var-secret-key" }} {{- if or .Values.postgresHostnameSecretKeyRef .Values.global.postgresHostnameSecretKeyRef }} {{- printf (coalesce .Values.postgresHostnameSecretKeyRef.key .Values.global.postgresHostnameSecretKeyRef.key) }} {{- else }} @@ -150,18 +150,18 @@ POSTGRES_HOSTNAME env var secret key {{- /* POSTGRES_PASSWORD env var secret name */}} -{{- define "cf-common-0.18.0.classic.postgres-password-env-var-secret-name" }} +{{- define "cf-common-0.18.1.classic.postgres-password-env-var-secret-name" }} {{- if or .Values.postgresPasswordSecretKeyRef .Values.global.postgresPasswordSecretKeyRef }} {{- printf (coalesce .Values.postgresPasswordSecretKeyRef.name .Values.global.postgresPasswordSecretKeyRef.name) }} {{- else }} -{{- printf "%s-%s" (include "cf-common-0.18.0.names.fullname" .) "secret" }} +{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }} {{- end }} {{- end }} {{- /* POSTGRES_PASSWORD env var secret key */}} -{{- define "cf-common-0.18.0.classic.postgres-password-env-var-secret-key" }} +{{- define "cf-common-0.18.1.classic.postgres-password-env-var-secret-key" }} {{- if or .Values.postgresPasswordSecretKeyRef .Values.global.postgresPasswordSecretKeyRef }} {{- printf (coalesce .Values.postgresPasswordSecretKeyRef.key .Values.global.postgresPasswordSecretKeyRef.key) }} {{- else }} @@ -172,18 +172,18 @@ POSTGRES_PASSWORD env var secret key {{- /* POSTGRES_USER env var secret name */}} -{{- define "cf-common-0.18.0.classic.postgres-user-env-var-secret-name" }} +{{- define "cf-common-0.18.1.classic.postgres-user-env-var-secret-name" }} {{- if or .Values.postgresUserSecretKeyRef .Values.global.postgresUserSecretKeyRef }} {{- printf (coalesce .Values.postgresUserSecretKeyRef.name .Values.global.postgresUserSecretKeyRef.name) }} {{- else }} -{{- printf "%s-%s" (include "cf-common-0.18.0.names.fullname" .) "secret" }} +{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }} {{- end }} {{- end }} {{- /* POSTGRES_USER env var secret key */}} -{{- define "cf-common-0.18.0.classic.postgres-user-env-var-secret-key" }} +{{- define "cf-common-0.18.1.classic.postgres-user-env-var-secret-key" }} {{- if or .Values.postgresUserSecretKeyRef .Values.global.postgresUserSecretKeyRef }} {{- printf (coalesce .Values.postgresUserSecretKeyRef.key .Values.global.postgresUserSecretKeyRef.key) }} {{- else }} @@ -194,18 +194,18 @@ POSTGRES_USER env var secret key {{- /* RABBITMQ_HOSTNAME env var secret name */}} -{{- define "cf-common-0.18.0.classic.rabbitmq-hostname-env-var-secret-name" }} +{{- define "cf-common-0.18.1.classic.rabbitmq-hostname-env-var-secret-name" }} {{- if or .Values.rabbitmqHostnameSecretKeyRef .Values.global.rabbitmqHostnameSecretKeyRef }} {{- printf (coalesce .Values.rabbitmqHostnameSecretKeyRef.name .Values.global.rabbitmqHostnameSecretKeyRef.name) }} {{- else }} -{{- printf "%s-%s" (include "cf-common-0.18.0.names.fullname" .) "secret" }} +{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }} {{- end }} {{- end }} {{- /* RABBITMQ_HOSTNAME env var secret key */}} -{{- define "cf-common-0.18.0.classic.rabbitmq-hostname-env-var-secret-key" }} +{{- define "cf-common-0.18.1.classic.rabbitmq-hostname-env-var-secret-key" }} {{- if or .Values.rabbitmqHostnameSecretKeyRef .Values.global.rabbitmqHostnameSecretKeyRef }} {{- printf (coalesce .Values.rabbitmqHostnameSecretKeyRef.key .Values.global.rabbitmqHostnameSecretKeyRef.key) }} {{- else }} @@ -216,18 +216,18 @@ RABBITMQ_HOSTNAME env var secret key {{- /* RABBITMQ_PASSWORD env var secret name */}} -{{- define "cf-common-0.18.0.classic.rabbitmq-password-env-var-secret-name" }} +{{- define "cf-common-0.18.1.classic.rabbitmq-password-env-var-secret-name" }} {{- if or .Values.rabbitmqPasswordSecretKeyRef .Values.global.rabbitmqPasswordSecretKeyRef }} {{- printf (coalesce .Values.rabbitmqPasswordSecretKeyRef.name .Values.global.rabbitmqPasswordSecretKeyRef.name) }} {{- else }} -{{- printf "%s-%s" (include "cf-common-0.18.0.names.fullname" .) "secret" }} +{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }} {{- end }} {{- end }} {{- /* RABBITMQ_PASSWORD env var secret key */}} -{{- define "cf-common-0.18.0.classic.rabbitmq-password-env-var-secret-key" }} +{{- define "cf-common-0.18.1.classic.rabbitmq-password-env-var-secret-key" }} {{- if or .Values.rabbitmqPasswordSecretKeyRef .Values.global.rabbitmqPasswordSecretKeyRef }} {{- printf (coalesce .Values.rabbitmqPasswordSecretKeyRef.key .Values.global.rabbitmqPasswordSecretKeyRef.key) }} {{- else }} @@ -238,18 +238,18 @@ RABBITMQ_PASSWORD env var secret key {{- /* RABBITMQ_USERNAME env var secret name */}} -{{- define "cf-common-0.18.0.classic.rabbitmq-username-env-var-secret-name" }} +{{- define "cf-common-0.18.1.classic.rabbitmq-username-env-var-secret-name" }} {{- if or .Values.rabbitmqUsernameSecretKeyRef .Values.global.rabbitmqUsernameSecretKeyRef }} {{- printf (coalesce .Values.rabbitmqUsernameSecretKeyRef.name .Values.global.rabbitmqUsernameSecretKeyRef.name) }} {{- else }} -{{- printf "%s-%s" (include "cf-common-0.18.0.names.fullname" .) "secret" }} +{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }} {{- end }} {{- end }} {{- /* RABBITMQ_USERNAME env var secret key */}} -{{- define "cf-common-0.18.0.classic.rabbitmq-username-env-var-secret-key" }} +{{- define "cf-common-0.18.1.classic.rabbitmq-username-env-var-secret-key" }} {{- if or .Values.rabbitmqUsernameSecretKeyRef .Values.global.rabbitmqUsernameSecretKeyRef }} {{- printf (coalesce .Values.rabbitmqUsernameSecretKeyRef.key .Values.global.rabbitmqUsernameSecretKeyRef.key) }} {{- else }} @@ -260,18 +260,18 @@ RABBITMQ_USERNAME env var secret key {{- /* FIREBASE_SECRET env var secret name */}} -{{- define "cf-common-0.18.0.classic.firebase-secret-env-var-secret-name" }} +{{- define "cf-common-0.18.1.classic.firebase-secret-env-var-secret-name" }} {{- if or .Values.firebaseSecretSecretKeyRef .Values.global.firebaseSecretSecretKeyRef }} {{- printf (coalesce .Values.firebaseSecretSecretKeyRef.name .Values.global.firebaseSecretSecretKeyRef.name) }} {{- else }} -{{- printf "%s-%s" (include "cf-common-0.18.0.names.fullname" .) "secret" }} +{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }} {{- end }} {{- end }} {{- /* FIREBASE_SECRET env var secret key */}} -{{- define "cf-common-0.18.0.classic.firebase-secret-env-var-secret-key" }} +{{- define "cf-common-0.18.1.classic.firebase-secret-env-var-secret-key" }} {{- if or .Values.firebaseSecretSecretKeyRef .Values.global.firebaseSecretSecretKeyRef }} {{- printf (coalesce .Values.firebaseSecretSecretKeyRef.key .Values.global.firebaseSecretSecretKeyRef.key) }} {{- else }} @@ -282,18 +282,18 @@ FIREBASE_SECRET env var secret key {{- /* FIREBASE_URL env var secret name */}} -{{- define "cf-common-0.18.0.classic.firebase-url-env-var-secret-name" }} +{{- define "cf-common-0.18.1.classic.firebase-url-env-var-secret-name" }} {{- if or .Values.firebaseUrlSecretKeyRef .Values.global.firebaseUrlSecretKeyRef }} {{- printf (coalesce .Values.firebaseUrlSecretKeyRef.name .Values.global.firebaseUrlSecretKeyRef.name) }} {{- else }} -{{- printf "%s-%s" (include "cf-common-0.18.0.names.fullname" .) "secret" }} +{{- printf "%s-%s" (include "cf-common-0.18.1.names.fullname" .) "secret" }} {{- end }} {{- end }} {{- /* FIREBASE_URL env var secret key */}} -{{- define "cf-common-0.18.0.classic.firebase-url-env-var-secret-key" }} +{{- define "cf-common-0.18.1.classic.firebase-url-env-var-secret-key" }} {{- if or .Values.firebaseUrlSecretKeyRef .Values.global.firebaseUrlSecretKeyRef }} {{- printf (coalesce .Values.firebaseUrlSecretKeyRef.key .Values.global.firebaseUrlSecretKeyRef.key) }} {{- else }} diff --git a/charts/cf-common/templates/classic/_helpers.tpl b/charts/cf-common/templates/classic/_helpers.tpl index e36e048..5b71044 100644 --- a/charts/cf-common/templates/classic/_helpers.tpl +++ b/charts/cf-common/templates/classic/_helpers.tpl @@ -2,10 +2,10 @@ Calculate RabbitMQ URI (for On-Prem) Must me called from chart root context. Usage: -{{ include "cf-common-0.18.0.classic.calculateRabbitMqUri" . }} +{{ include "cf-common-0.18.1.classic.calculateRabbitMqUri" . }} */}} -{{- define "cf-common-0.18.0.classic.calculateRabbitMqUri" }} +{{- define "cf-common-0.18.1.classic.calculateRabbitMqUri" }} {{- $rabbitmqProtocol := .Values.global.rabbitmqProtocol | default "amqp" -}} {{- $rabbitmqUsername := .Values.global.rabbitmqUsername -}} @@ -23,9 +23,9 @@ coalesce here for backward compatibility {{/* Calculate Mongo Uri (for On-Prem) Usage: -{{ include "cf.common-0.18.0.classic.calculateMongoUri" (dict "dbName" $.Values.global.pipelineManagerService "mongoURI" $.Values.global.mongoURI) }} +{{ include "cf.common-0.18.1.classic.calculateMongoUri" (dict "dbName" $.Values.global.pipelineManagerService "mongoURI" $.Values.global.mongoURI) }} */}} -{{- define "cf-common-0.18.0.classic.calculateMongoUri" -}} +{{- define "cf-common-0.18.1.classic.calculateMongoUri" -}} {{- if contains "?" .mongoURI -}} {{- $mongoURI := (splitList "?" .mongoURI) -}} {{- printf "%s%s?%s" (first $mongoURI) .dbName (last $mongoURI) }} @@ -39,7 +39,7 @@ Usage: {{/* Calculate Consul host Uri (for On-Prem) */}} -{{- define "cf-common-0.18.0.classic.calculateConsulUri" }} +{{- define "cf-common-0.18.1.classic.calculateConsulUri" }} {{- if .Values.global.consulHost }} {{- printf "http://%s:%v" .Values.global.consulHost .Values.global.consulHttpPort -}} {{- else }} diff --git a/charts/cf-common/templates/common/_annotations.tpl b/charts/cf-common/templates/common/_annotations.tpl index b145741..5de4a30 100644 --- a/charts/cf-common/templates/common/_annotations.tpl +++ b/charts/cf-common/templates/common/_annotations.tpl @@ -2,19 +2,19 @@ Render checksum annotation Must be called from chart root context. Usage: -annotations: {{ include "cf-common-0.18.0.annotations.podAnnotations" . | nindent }} +annotations: {{ include "cf-common-0.18.1.annotations.podAnnotations" . | nindent }} */}} -{{- define "cf-common-0.18.0.annotations.podAnnotations" -}} +{{- define "cf-common-0.18.1.annotations.podAnnotations" -}} {{- if .Values.podAnnotations -}} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.podAnnotations "context" $) | nindent 0 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.podAnnotations "context" $) | nindent 0 }} {{- end -}} {{- $configMapFound := dict -}} {{- range $configMapIndex, $configMapItem := .Values.configMaps -}} {{- if $configMapItem.enabled -}} - {{- $_ := set $configMapFound $configMapIndex ( include "cf-common-0.18.0.tplrender" (dict "Values" $configMapItem.data "context" $) | sha256sum) -}} + {{- $_ := set $configMapFound $configMapIndex ( include "cf-common-0.18.1.tplrender" (dict "Values" $configMapItem.data "context" $) | sha256sum) -}} {{- end -}} {{- if $configMapFound -}} @@ -27,7 +27,7 @@ annotations: {{ include "cf-common-0.18.0.annotations.podAnnotations" . | ninden {{- range $secretIndex, $secretItem := .Values.secrets -}} {{- if $secretItem.enabled -}} - {{- $_ := set $secretFound $secretIndex ( include "cf-common-0.18.0.tplrender" (dict "Values" $secretItem.stringData "context" $) | sha256sum) -}} + {{- $_ := set $secretFound $secretIndex ( include "cf-common-0.18.1.tplrender" (dict "Values" $secretItem.stringData "context" $) | sha256sum) -}} {{- end -}} {{- if $secretFound -}} diff --git a/charts/cf-common/templates/common/_labels.tpl b/charts/cf-common/templates/common/_labels.tpl index 7326c56..57836b7 100644 --- a/charts/cf-common/templates/common/_labels.tpl +++ b/charts/cf-common/templates/common/_labels.tpl @@ -1,9 +1,9 @@ {{/* Kubernetes standard labels */}} -{{- define "cf-common-0.18.0.labels.standard" -}} -app.kubernetes.io/name: {{ include "cf-common-0.18.0.names.name" . }} -helm.sh/chart: {{ include "cf-common-0.18.0.names.chart" . }} +{{- define "cf-common-0.18.1.labels.standard" -}} +app.kubernetes.io/name: {{ include "cf-common-0.18.1.names.name" . }} +helm.sh/chart: {{ include "cf-common-0.18.1.names.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end -}} @@ -11,8 +11,8 @@ app.kubernetes.io/managed-by: {{ .Release.Service }} {{/* Labels to use on deploy.spec.selector.matchLabels and svc.spec.selector */}} -{{- define "cf-common-0.18.0.labels.matchLabels" -}} -app.kubernetes.io/name: {{ include "cf-common-0.18.0.names.name" . }} +{{- define "cf-common-0.18.1.labels.matchLabels" -}} +app.kubernetes.io/name: {{ include "cf-common-0.18.1.names.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} {{- end -}} @@ -20,9 +20,9 @@ app.kubernetes.io/instance: {{ .Release.Name }} {{/* Extra labels Usage: -{{ include "cf-common-0.18.0.labels.extraLabels" ( dict "Values" .Values.path.to.the.labels "context" $) }} +{{ include "cf-common-0.18.1.labels.extraLabels" ( dict "Values" .Values.path.to.the.labels "context" $) }} */}} -{{- define "cf-common-0.18.0.labels.extraLabels" -}} +{{- define "cf-common-0.18.1.labels.extraLabels" -}} {{- if not (kindIs "map" .Values) -}} {{- fail "ERROR: labels block must be a map" -}} {{- end -}} @@ -34,9 +34,9 @@ Usage: {{/* Annotations Usage: -{{ include "cf-common-0.18.0.annotations" ( dict "Values" .Values.path.to.the.annotations "context" $) }} +{{ include "cf-common-0.18.1.annotations" ( dict "Values" .Values.path.to.the.annotations "context" $) }} */}} -{{- define "cf-common-0.18.0.annotations" -}} +{{- define "cf-common-0.18.1.annotations" -}} {{- if not (kindIs "map" .Values) -}} {{- fail "ERROR: annotations block must be a map" -}} {{- end -}} diff --git a/charts/cf-common/templates/common/_names.tpl b/charts/cf-common/templates/common/_names.tpl index 616cb26..de3e848 100644 --- a/charts/cf-common/templates/common/_names.tpl +++ b/charts/cf-common/templates/common/_names.tpl @@ -1,14 +1,14 @@ {{/* Expand the name of the chart. */}} -{{- define "cf-common-0.18.0.names.name" -}} +{{- define "cf-common-0.18.1.names.name" -}} {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Create chart name and version as used by the chart label. */}} -{{- define "cf-common-0.18.0.names.chart" -}} +{{- define "cf-common-0.18.1.names.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} {{- end -}} @@ -17,7 +17,7 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). If release name contains chart name it will be used as a full name. */}} -{{- define "cf-common-0.18.0.names.fullname" -}} +{{- define "cf-common-0.18.1.names.fullname" -}} {{- if .Values.fullnameOverride -}} {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} {{- else -}} @@ -33,10 +33,10 @@ If release name contains chart name it will be used as a full name. {{/* ServiceAccount Name */}} -{{- define "cf-common-0.18.0.names.serviceAccountName" -}} +{{- define "cf-common-0.18.1.names.serviceAccountName" -}} {{- if .Values.serviceAccount -}} {{- if .Values.serviceAccount.enabled -}} - {{- .Values.serviceAccount.nameOverride | default (include "cf-common-0.18.0.names.fullname" .) -}} + {{- .Values.serviceAccount.nameOverride | default (include "cf-common-0.18.1.names.fullname" .) -}} {{- else -}} {{- print "default" -}} {{- end -}} diff --git a/charts/cf-common/templates/common/_tpl.tpl b/charts/cf-common/templates/common/_tpl.tpl index df6d66a..d63a523 100644 --- a/charts/cf-common/templates/common/_tpl.tpl +++ b/charts/cf-common/templates/common/_tpl.tpl @@ -1,9 +1,9 @@ {{/* Renders a value that contains template. Usage: -{{ include "cf-common-0.18.0.tplrender" ( dict "Values" .Values.path.to.the.Value "context" $) }} +{{ include "cf-common-0.18.1.tplrender" ( dict "Values" .Values.path.to.the.Value "context" $) }} */}} -{{- define "cf-common-0.18.0.tplrender" -}} +{{- define "cf-common-0.18.1.tplrender" -}} {{- $tpl := .Values -}} {{- if not (typeIs "string" $tpl) -}} {{- $tpl = toYaml $tpl -}} diff --git a/charts/cf-common/templates/common/_versions.tpl b/charts/cf-common/templates/common/_versions.tpl index 9fc2fd8..f440ac5 100644 --- a/charts/cf-common/templates/common/_versions.tpl +++ b/charts/cf-common/templates/common/_versions.tpl @@ -1,21 +1,21 @@ {{/* Return the target Kubernetes version */}} -{{- define "cf-common-0.18.0.kubeVersion" -}} +{{- define "cf-common-0.18.1.kubeVersion" -}} {{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride -}} {{- end -}} {{/* Return the appropriate apiVersion for HPA */}} -{{- define "cf-common-0.18.0.apiVersion.autoscaling" -}} +{{- define "cf-common-0.18.1.apiVersion.autoscaling" -}} {{- if .Values.apiVersionOverrides -}} {{- if .Values.apiVersionOverrides.autoscaling -}} {{- print .Values.apiVersionOverrides.autoscaling -}} {{- else -}} {{- print "autoscaling/v2" -}} {{- end -}} -{{- else if semverCompare "<1.23-0" (include "cf-common-0.18.0.kubeVersion" . ) -}} +{{- else if semverCompare "<1.23-0" (include "cf-common-0.18.1.kubeVersion" . ) -}} {{- print "autoscaling/v2beta2" -}} {{- else -}} {{- print "autoscaling/v2" -}} diff --git a/charts/cf-common/templates/container/_container.tpl b/charts/cf-common/templates/container/_container.tpl index e75e212..6c390e4 100644 --- a/charts/cf-common/templates/container/_container.tpl +++ b/charts/cf-common/templates/container/_container.tpl @@ -2,27 +2,27 @@ Renders main container in pod template. Called from pod template. Usage: -{{ include "cf-common-0.18.0.container" (dict "Values" .Values.container "context" $) }} +{{ include "cf-common-0.18.1.container" (dict "Values" .Values.container "context" $) }} */}} -{{- define "cf-common-0.18.0.container" -}} +{{- define "cf-common-0.18.1.container" -}} {{/* Restoring root $ context */}} {{- $ := .context -}} -{{- $containerName := include "cf-common-0.18.0.names.fullname" $ -}} +{{- $containerName := include "cf-common-0.18.1.names.fullname" $ -}} {{- if and (hasKey .Values "nameOverride") .Values.nameOverride }} -{{- $containerName = include "cf-common-0.18.0.tplrender" (dict "Values" .Values.nameOverride "context" $) -}} +{{- $containerName = include "cf-common-0.18.1.tplrender" (dict "Values" .Values.nameOverride "context" $) -}} {{- end }} - name: {{ $containerName }} - image: {{ (include "cf-common-0.18.0.tplrender" (dict "Values" (include "cf-common-0.18.0.image.name" (dict "image" .Values.image "context" $)) "context" $)) }} + image: {{ (include "cf-common-0.18.1.tplrender" (dict "Values" (include "cf-common-0.18.1.image.name" (dict "image" .Values.image "context" $)) "context" $)) }} imagePullPolicy: {{ .Values.image.pullPolicy | default "Always" }} {{- with .Values.command }} {{- if not (kindIs "slice" .) }} {{- fail "ERROR: container.command block must be a list!" }} {{- end }} - command: {{- include "cf-common-0.18.0.tplrender" (dict "Values" . "context" $) | nindent 2 }} + command: {{- include "cf-common-0.18.1.tplrender" (dict "Values" . "context" $) | nindent 2 }} {{- end }} {{- with .Values.args }} @@ -52,12 +52,12 @@ Usage: {{- if not (kindIs "slice" .) }} {{ fail "ERROR: container.envFrom block must be a list!"}} {{- end }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" . "context" $) | trim | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" . "context" $) | trim | nindent 4 }} {{- end }} {{- range $secretName, $secretItem := $.Values.secrets }} {{- if $secretItem.enabled }} - secretRef: - name: {{ printf "%s-%s" (include "cf-common-0.18.0.names.fullname" $) $secretName }} + name: {{ printf "%s-%s" (include "cf-common-0.18.1.names.fullname" $) $secretName }} {{- end }} {{- end }} {{- end }} @@ -74,10 +74,10 @@ For backward compatibility (.Values.env takes precedence over .Values.container. {{- $mergedEnv = merge $mergedEnv $.Values.global.env }} {{- end }} env: - {{- include "cf-common-0.18.0.env-vars" (dict "Values" $mergedEnv "context" $) | trim | nindent 2 }} + {{- include "cf-common-0.18.1.env-vars" (dict "Values" $mergedEnv "context" $) | trim | nindent 2 }} {{- end }} - {{- include "cf-common-0.18.0.ports" $ | trim | nindent 2 }} + {{- include "cf-common-0.18.1.ports" $ | trim | nindent 2 }} {{- /* For backward compatibility (.Values.volumeMounts takes precedence over .Values.container.volumeMounts) @@ -86,10 +86,10 @@ For backward compatibility (.Values.volumeMounts takes precedence over .Values.c {{- if $.Values.volumeMounts }} {{- $mergedVolumeMounts = mergeOverwrite $mergedVolumeMounts $.Values.volumeMounts }} {{- end }} - volumeMounts: {{ include "cf-common-0.18.0.volumeMounts" (dict "Values" $mergedVolumeMounts "context" $) | trim | nindent 2 }} + volumeMounts: {{ include "cf-common-0.18.1.volumeMounts" (dict "Values" $mergedVolumeMounts "context" $) | trim | nindent 2 }} {{- with .Values.probes }} - {{- include "cf-common-0.18.0.probes" . | trim | nindent 2 }} + {{- include "cf-common-0.18.1.probes" . | trim | nindent 2 }} {{- end }} {{- with .Values.resources }} diff --git a/charts/cf-common/templates/container/_env_vars.tpl b/charts/cf-common/templates/container/_env_vars.tpl index 09cd879..06e6be0 100644 --- a/charts/cf-common/templates/container/_env_vars.tpl +++ b/charts/cf-common/templates/container/_env_vars.tpl @@ -2,9 +2,9 @@ Renders env vars in container template. Called from container template. Usage: -env: {{ include "cf-common-0.18.0.env-vars" (dict "Values" .Values.container.env "context" $) | nindent }} +env: {{ include "cf-common-0.18.1.env-vars" (dict "Values" .Values.container.env "context" $) | nindent }} */}} -{{- define "cf-common-0.18.0.env-vars"}} +{{- define "cf-common-0.18.1.env-vars"}} {{- $ := .context }} {{- if .Values }} {{- if not (kindIs "map" .Values) }} @@ -12,7 +12,7 @@ env: {{ include "cf-common-0.18.0.env-vars" (dict "Values" .Values.container.env {{- end }} {{- end }} {{- $env := .Values }} - {{- $templatedEnv := include "cf-common-0.18.0.tplrender" (dict "Values" $env "context" $) | fromYaml }} + {{- $templatedEnv := include "cf-common-0.18.1.tplrender" (dict "Values" $env "context" $) | fromYaml }} {{- range $name, $val := $templatedEnv }} {{- if or (kindIs "string" $val) (kindIs "bool" $val) (kindIs "int" $val) (kindIs "float64" $val) }} - name: {{ $name }} diff --git a/charts/cf-common/templates/container/_image.tpl b/charts/cf-common/templates/container/_image.tpl index 356e9be..7d5efcf 100644 --- a/charts/cf-common/templates/container/_image.tpl +++ b/charts/cf-common/templates/container/_image.tpl @@ -2,9 +2,9 @@ Prints full image name. Called from container template. Usage: -{{ include "cf-common-0.18.0.image.name" (dict "image" .Values.container.image "context" $) }} +{{ include "cf-common-0.18.1.image.name" (dict "image" .Values.container.image "context" $) }} */}} -{{- define "cf-common-0.18.0.image.name" -}} +{{- define "cf-common-0.18.1.image.name" -}} {{/* Restoring root $ context */}} {{- $ := .context -}} @@ -47,7 +47,11 @@ For backward compatibility (onprem with private docker registry) {{- end -}} {{- end -}} -{{- printf "%s/%s:%s" $registryName $repositoryName $imageTag -}} +{{- if $registryName -}} + {{- printf "%s/%s:%s" $registryName $repositoryName $imageTag -}} +{{- else }} + {{- printf "%s:%s" $repositoryName $imageTag -}} +{{- end }} {{- end -}} @@ -55,9 +59,9 @@ For backward compatibility (onprem with private docker registry) Prints full image name. Must be called from chart root context. Usage: -{{ include "cf-common-0.18.0.image.pullSecrets" . }} +{{ include "cf-common-0.18.1.image.pullSecrets" . }} */}} -{{- define "cf-common-0.18.0.image.pullSecrets" -}} +{{- define "cf-common-0.18.1.image.pullSecrets" -}} {{- $pullSecrets := list }} {{- if .Values.global.imagePullSecrets }} @@ -66,7 +70,7 @@ Usage: {{- end -}} {{- range .Values.global.imagePullSecrets -}} - {{- $pullSecrets = append $pullSecrets (include "cf-common-0.18.0.tplrender" (dict "Values" . "context" $)) -}} + {{- $pullSecrets = append $pullSecrets (include "cf-common-0.18.1.tplrender" (dict "Values" . "context" $)) -}} {{- end -}} {{- end -}} @@ -76,7 +80,7 @@ Usage: {{- end -}} {{- range .Values.imagePullSecrets -}} - {{- $pullSecrets = append $pullSecrets (include "cf-common-0.18.0.tplrender" (dict "Values" . "context" $)) -}} + {{- $pullSecrets = append $pullSecrets (include "cf-common-0.18.1.tplrender" (dict "Values" . "context" $)) -}} {{- end -}} {{- end -}} diff --git a/charts/cf-common/templates/container/_ports.tpl b/charts/cf-common/templates/container/_ports.tpl index 3031348..ba27a0c 100644 --- a/charts/cf-common/templates/container/_ports.tpl +++ b/charts/cf-common/templates/container/_ports.tpl @@ -2,10 +2,10 @@ Renders ports map in container. Ports are obtained from .Values.service Called from container template. Usage: -ports: {{- include "cf-common-0.18.0.ports" $ | nindent }} +ports: {{- include "cf-common-0.18.1.ports" $ | nindent }} */}} -{{- define "cf-common-0.18.0.ports" -}} +{{- define "cf-common-0.18.1.ports" -}} {{- $ports := list -}} {{- range $serviceName, $serviceItem := .Values.service }} diff --git a/charts/cf-common/templates/container/_probes.tpl b/charts/cf-common/templates/container/_probes.tpl index 03bff73..34a4681 100644 --- a/charts/cf-common/templates/container/_probes.tpl +++ b/charts/cf-common/templates/container/_probes.tpl @@ -2,9 +2,9 @@ Renders probes map in container. Called from container template. Usage: -probes: {{ include "cf-common-0.18.0.probes" .Values.container.probes | nindent 2 }} +probes: {{ include "cf-common-0.18.1.probes" .Values.container.probes | nindent 2 }} */}} -{{- define "cf-common-0.18.0.probes" -}} +{{- define "cf-common-0.18.1.probes" -}} {{- range $probeName, $probeItem := . }} diff --git a/charts/cf-common/templates/container/_volumemounts.tpl b/charts/cf-common/templates/container/_volumemounts.tpl index 751ff65..1a96905 100644 --- a/charts/cf-common/templates/container/_volumemounts.tpl +++ b/charts/cf-common/templates/container/_volumemounts.tpl @@ -2,10 +2,10 @@ Renders volumeMounts list in container. Called from container template. Usage: -volumeMounts: {{- include "cf-common-0.18.0.volumeMounts" (dict "Values" .Values.container.volumeMounts "context" $) | nindent 2 }} +volumeMounts: {{- include "cf-common-0.18.1.volumeMounts" (dict "Values" .Values.container.volumeMounts "context" $) | nindent 2 }} */}} -{{- define "cf-common-0.18.0.volumeMounts" -}} +{{- define "cf-common-0.18.1.volumeMounts" -}} {{/* Restoring root $ context */}} {{- $ := .context -}} diff --git a/charts/cf-common/templates/controller/_analysis-template.tpl b/charts/cf-common/templates/controller/_analysis-template.tpl index 01d58b4..b7dc649 100644 --- a/charts/cf-common/templates/controller/_analysis-template.tpl +++ b/charts/cf-common/templates/controller/_analysis-template.tpl @@ -1,6 +1,6 @@ -{{- define "cf-common-0.18.0.controller.analysis-template" -}} +{{- define "cf-common-0.18.1.controller.analysis-template" -}} -{{- $fullName:= include "cf-common-0.18.0.names.fullname" . }} +{{- $fullName:= include "cf-common-0.18.1.names.fullname" . }} --- apiVersion: argoproj.io/v1alpha1 @@ -9,7 +9,7 @@ metadata: name: error-rate-{{ $fullName }} spec: {{- with .Values.controller.rollout.analysisTemplate }} - args: {{- include "cf-common-0.18.0.tplrender" (dict "Values" .args "context" $) | nindent 4 }} + args: {{- include "cf-common-0.18.1.tplrender" (dict "Values" .args "context" $) | nindent 4 }} metrics: {{- .metrics | toYaml | nindent 4 }} {{- end }} diff --git a/charts/cf-common/templates/controller/_controller.tpl b/charts/cf-common/templates/controller/_controller.tpl index be3ef90..84c3588 100644 --- a/charts/cf-common/templates/controller/_controller.tpl +++ b/charts/cf-common/templates/controller/_controller.tpl @@ -2,10 +2,10 @@ Renders contoller object. Must be called from chart root context. Usage: -{{- include "cf-common-0.18.0.controller" . -}} +{{- include "cf-common-0.18.1.controller" . -}} */}} -{{- define "cf-common-0.18.0.controller" -}} +{{- define "cf-common-0.18.1.controller" -}} {{- if .Values.controller.enabled -}} @@ -20,22 +20,22 @@ Usage: {{- $_ := set .Values "controller" (deepCopy $mergedControllerValues) -}} {{- if eq .Values.controller.type "rollout" }} - {{ include "cf-common-0.18.0.controller.rollout" . | nindent 0 }} + {{ include "cf-common-0.18.1.controller.rollout" . | nindent 0 }} {{- if .Values.controller.rollout }} {{- if .Values.controller.rollout.analysisTemplate }} {{- if .Values.controller.rollout.analysisTemplate.enabled }} - {{ include "cf-common-0.18.0.controller.analysis-template" . | nindent 0 }} + {{ include "cf-common-0.18.1.controller.analysis-template" . | nindent 0 }} {{- end }} {{- end }} {{- end }} {{- else if eq .Values.controller.type "deployment" }} - {{ include "cf-common-0.18.0.controller.deployment" . | nindent 0 }} + {{ include "cf-common-0.18.1.controller.deployment" . | nindent 0 }} {{- else if eq .Values.controller.type "statefulset" }} - {{ include "cf-common-0.18.0.controller.statefulset" . | nindent 0 }} + {{ include "cf-common-0.18.1.controller.statefulset" . | nindent 0 }} {{- else if eq .Values.controller.type "job" }} - {{ include "cf-common-0.18.0.controller.job" . | nindent 0 }} + {{ include "cf-common-0.18.1.controller.job" . | nindent 0 }} {{- else if eq .Values.controller.type "cronjob" }} - {{ include "cf-common-0.18.0.controller.cronjob" . | nindent 0 }} + {{ include "cf-common-0.18.1.controller.cronjob" . | nindent 0 }} {{- else }} {{ fail (printf "ERROR: %s is invalid controller type!" .Values.controller.type) }} {{- end }} diff --git a/charts/cf-common/templates/controller/_cronjob.tpl b/charts/cf-common/templates/controller/_cronjob.tpl index 3abfbe3..6544587 100644 --- a/charts/cf-common/templates/controller/_cronjob.tpl +++ b/charts/cf-common/templates/controller/_cronjob.tpl @@ -2,23 +2,23 @@ Renders cronjob template. Must be called from chart root context. Usage: -{{ include "cf-common-0.18.0.controller.cronjob" . }} +{{ include "cf-common-0.18.1.controller.cronjob" . }} */}} -{{- define "cf-common-0.18.0.controller.cronjob" -}} +{{- define "cf-common-0.18.1.controller.cronjob" -}} --- apiVersion: batch/v1 kind: CronJob metadata: - name: {{ include "cf-common-0.18.0.names.fullname" . }} - labels: {{ include "cf-common-0.18.0.labels.standard" . | nindent 4 }} + name: {{ include "cf-common-0.18.1.names.fullname" . }} + labels: {{ include "cf-common-0.18.1.labels.standard" . | nindent 4 }} {{- if .Values.controller.labels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.controller.labels "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.controller.labels "context" $) | nindent 4 }} {{- end }} {{- if .Values.controller.annotations }} annotations: - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.controller.annotations "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.controller.annotations "context" $) | nindent 4 }} {{- end }} spec: concurrencyPolicy: {{ .Values.controller.cronjob.concurrencyPolicy }} @@ -45,15 +45,15 @@ spec: {{- end }} template: metadata: - labels: {{ include "cf-common-0.18.0.labels.matchLabels" . | nindent 12 }} + labels: {{ include "cf-common-0.18.1.labels.matchLabels" . | nindent 12 }} {{- if .Values.podLabels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.podLabels "context" $) | nindent 12 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.podLabels "context" $) | nindent 12 }} {{- end }} - {{- with include "cf-common-0.18.0.annotations.podAnnotations" . }} + {{- with include "cf-common-0.18.1.annotations.podAnnotations" . }} annotations: {{- . | nindent 12 }} {{- end }} - spec: {{- include "cf-common-0.18.0.controller.pod" . | trim | nindent 10 -}} + spec: {{- include "cf-common-0.18.1.controller.pod" . | trim | nindent 10 -}} {{- with .Values.controller.cronjob.ttlSecondsAfterFinished }} ttlSecondsAfterFinished: {{ . }} {{- end }} diff --git a/charts/cf-common/templates/controller/_deployment.tpl b/charts/cf-common/templates/controller/_deployment.tpl index 564abbd..54e4d02 100644 --- a/charts/cf-common/templates/controller/_deployment.tpl +++ b/charts/cf-common/templates/controller/_deployment.tpl @@ -2,10 +2,10 @@ Renders deployment template Must be called from chart root context. Usage: -{{ include "cf-common-0.18.0.controller.deployment" . }} +{{ include "cf-common-0.18.1.controller.deployment" . }} */}} -{{- define "cf-common-0.18.0.controller.deployment" -}} +{{- define "cf-common-0.18.1.controller.deployment" -}} {{- $controllerValues := deepCopy .Values.controller -}} {{- $deploymentValues := dict -}} @@ -21,7 +21,7 @@ Usage: {{- fail (printf "ERROR: %s is invalid Deployment strategy!" $strategy) -}} {{- end -}} -{{- $deploymentName := include "cf-common-0.18.0.names.fullname" . -}} +{{- $deploymentName := include "cf-common-0.18.1.names.fullname" . -}} {{- if and (hasKey .Values.controller "nameOverride") .Values.controller.nameOverride -}} {{- $deploymentName = printf "%v-%v" $deploymentName .Values.controller.nameOverride -}} {{- end -}} @@ -31,13 +31,13 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ $deploymentName }} - labels: {{ include "cf-common-0.18.0.labels.standard" . | nindent 4 }} + labels: {{ include "cf-common-0.18.1.labels.standard" . | nindent 4 }} {{- if .Values.controller.labels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.controller.labels "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.controller.labels "context" $) | nindent 4 }} {{- end }} {{- if .Values.controller.annotations }} annotations: - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.controller.annotations "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.controller.annotations "context" $) | nindent 4 }} {{- end }} spec: revisionHistoryLimit: {{ .Values.controller.revisionHistoryLimit | int | default 5 }} @@ -45,7 +45,7 @@ spec: replicas: {{ coalesce .Values.controller.replicas .Values.replicaCount | int | default 1 }} {{- end }} selector: - matchLabels: {{ include "cf-common-0.18.0.labels.matchLabels" . | nindent 6 }} + matchLabels: {{ include "cf-common-0.18.1.labels.matchLabels" . | nindent 6 }} strategy: type: {{ $strategy }} {{- with .Values.controller.rollingUpdate }} @@ -61,13 +61,13 @@ spec: {{- end }} template: metadata: - labels: {{ include "cf-common-0.18.0.labels.matchLabels" . | nindent 8 }} + labels: {{ include "cf-common-0.18.1.labels.matchLabels" . | nindent 8 }} {{- if .Values.podLabels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.podLabels "context" $) | nindent 8 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.podLabels "context" $) | nindent 8 }} {{- end }} {{- if .Values.podAnnotations }} annotations: - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.podAnnotations "context" $) | nindent 8 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.podAnnotations "context" $) | nindent 8 }} {{- end }} - spec: {{- include "cf-common-0.18.0.controller.pod" . | trim | nindent 6 -}} + spec: {{- include "cf-common-0.18.1.controller.pod" . | trim | nindent 6 -}} {{- end -}} diff --git a/charts/cf-common/templates/controller/_job.tpl b/charts/cf-common/templates/controller/_job.tpl index 916fa50..7dc21e6 100644 --- a/charts/cf-common/templates/controller/_job.tpl +++ b/charts/cf-common/templates/controller/_job.tpl @@ -2,23 +2,23 @@ Renders job template. Must be called from chart root context. Usage: -{{ include "cf-common-0.18.0.controller.job" . }} +{{ include "cf-common-0.18.1.controller.job" . }} */}} -{{- define "cf-common-0.18.0.controller.job" -}} +{{- define "cf-common-0.18.1.controller.job" -}} --- apiVersion: batch/v1 kind: Job metadata: - name: {{ include "cf-common-0.18.0.names.fullname" . }} - labels: {{ include "cf-common-0.18.0.labels.standard" . | nindent 4 }} + name: {{ include "cf-common-0.18.1.names.fullname" . }} + labels: {{ include "cf-common-0.18.1.labels.standard" . | nindent 4 }} {{- if .Values.controller.labels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.controller.labels "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.controller.labels "context" $) | nindent 4 }} {{- end }} {{- if .Values.controller.annotations }} annotations: - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.controller.annotations "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.controller.annotations "context" $) | nindent 4 }} {{- end }} spec: {{- if .Values.controller.job.suspend }} @@ -40,22 +40,22 @@ spec: manualSelector: {{ .Values.controller.job.manualSelector }} {{- if .Values.controller.job.selector }} selector: - matchLabels: {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.controller.job.selector "context" $) | nindent 6 }} + matchLabels: {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.controller.job.selector "context" $) | nindent 6 }} {{- else }} {{ fail (printf "ERROR: manualSelector is enabled! Specify `.job.selector` labels!") }} {{- end }} {{- end }} template: metadata: - labels: {{ include "cf-common-0.18.0.labels.matchLabels" . | nindent 8 }} + labels: {{ include "cf-common-0.18.1.labels.matchLabels" . | nindent 8 }} {{- if .Values.podLabels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.podLabels "context" $) | nindent 8 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.podLabels "context" $) | nindent 8 }} {{- end }} - {{- with include "cf-common-0.18.0.annotations.podAnnotations" . }} + {{- with include "cf-common-0.18.1.annotations.podAnnotations" . }} annotations: {{- . | nindent 8 }} {{- end }} - spec: {{- include "cf-common-0.18.0.controller.pod" . | trim | nindent 6 -}} + spec: {{- include "cf-common-0.18.1.controller.pod" . | trim | nindent 6 -}} {{- with .Values.controller.job.ttlSecondsAfterFinished }} ttlSecondsAfterFinished: {{ . }} {{- end }} diff --git a/charts/cf-common/templates/controller/_pod.tpl b/charts/cf-common/templates/controller/_pod.tpl index 08f1804..5656041 100644 --- a/charts/cf-common/templates/controller/_pod.tpl +++ b/charts/cf-common/templates/controller/_pod.tpl @@ -2,13 +2,13 @@ Renders pod spec. Called from contoller template. Usage: -{{ include "cf-common-0.18.0.controller.pod" . }} +{{ include "cf-common-0.18.1.controller.pod" . }} */}} -{{- define "cf-common-0.18.0.controller.pod" -}} +{{- define "cf-common-0.18.1.controller.pod" -}} -{{- include "cf-common-0.18.0.image.pullSecrets" . }} +{{- include "cf-common-0.18.1.image.pullSecrets" . }} -serviceAccountName: {{ include "cf-common-0.18.0.names.serviceAccountName" . }} +serviceAccountName: {{ include "cf-common-0.18.1.names.serviceAccountName" . }} automountServiceAccountToken: {{ .Values.automountServiceAccountToken | default true }} @@ -58,22 +58,22 @@ initContainers: {{- range $initContainerIndex, $initContainerItem := .Values.initContainers }} {{- if $initContainerItem.enabled }} {{- $_ := set $initContainerItem "nameOverride" $initContainerIndex }} - {{- include "cf-common-0.18.0.container" (dict "Values" $initContainerItem "context" $) | trim | nindent 0 }} + {{- include "cf-common-0.18.1.container" (dict "Values" $initContainerItem "context" $) | trim | nindent 0 }} {{- end }} {{- end }} {{- end }} {{- with .Values.container }} -containers: {{ include "cf-common-0.18.0.container" (dict "Values" . "context" $) | trim | nindent 0 }} +containers: {{ include "cf-common-0.18.1.container" (dict "Values" . "context" $) | trim | nindent 0 }} {{- end }} {{- with .Values.additionalContainers }} {{ toYaml . | nindent 0 }} {{- end }} -volumes: {{ include "cf-common-0.18.0.volumes" (dict "Values" .Values.volumes "context" $) | trim | nindent 0 }} +volumes: {{ include "cf-common-0.18.1.volumes" (dict "Values" .Values.volumes "context" $) | trim | nindent 0 }} {{- with .Values.extraVolumes }} -{{ include "cf-common-0.18.0.volumes" (dict "Values" . "context" $) | trim }} +{{ include "cf-common-0.18.1.volumes" (dict "Values" . "context" $) | trim }} {{- end }} {{- with .Values.hostAliases }} @@ -102,7 +102,7 @@ affinity: {{ toYaml . | nindent 2 }} {{- end }} {{- with .Values.topologySpreadConstraints }} -topologySpreadConstraints: {{- include "cf-common-0.18.0.tplrender" (dict "Values" . "context" $) | nindent 2 }} +topologySpreadConstraints: {{- include "cf-common-0.18.1.tplrender" (dict "Values" . "context" $) | nindent 2 }} {{- end }} {{- with .Values.controller.restartPolicy }} diff --git a/charts/cf-common/templates/controller/_rollout.tpl b/charts/cf-common/templates/controller/_rollout.tpl index 5294e51..98d5624 100644 --- a/charts/cf-common/templates/controller/_rollout.tpl +++ b/charts/cf-common/templates/controller/_rollout.tpl @@ -2,11 +2,11 @@ Renders rollout template. Must be called from chart root context. Usage: -{{ include "cf-common-0.18.0.controller.rollout" . }} +{{ include "cf-common-0.18.1.controller.rollout" . }} */}} -{{- define "cf-common-0.18.0.controller.rollout" -}} +{{- define "cf-common-0.18.1.controller.rollout" -}} -{{- $fullName:= include "cf-common-0.18.0.names.fullname" . }} +{{- $fullName:= include "cf-common-0.18.1.names.fullname" . }} {{- $controllerValues := deepCopy .Values.controller -}} {{- $rolloutValues := dict -}} @@ -22,7 +22,7 @@ Usage: {{- fail (printf "ERROR: %s is invalid Rollout strategy!" $strategy) -}} {{- end -}} -{{- $rolloutName := include "cf-common-0.18.0.names.fullname" . -}} +{{- $rolloutName := include "cf-common-0.18.1.names.fullname" . -}} {{- if and (hasKey .Values.controller "nameOverride") .Values.controller.nameOverride -}} {{- $rolloutName = printf "%v-%v" $rolloutName .Values.controller.nameOverride -}} {{- end -}} @@ -32,13 +32,13 @@ apiVersion: argoproj.io/v1alpha1 kind: Rollout metadata: name: {{ $rolloutName }} - labels: {{ include "cf-common-0.18.0.labels.standard" . | nindent 4 }} + labels: {{ include "cf-common-0.18.1.labels.standard" . | nindent 4 }} {{- if .Values.controller.labels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.controller.labels "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.controller.labels "context" $) | nindent 4 }} {{- end }} {{- if .Values.controller.annotations }} annotations: - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.controller.annotations "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.controller.annotations "context" $) | nindent 4 }} {{- end }} spec: revisionHistoryLimit: {{ .Values.controller.revisionHistoryLimit | int | default 5 }} @@ -46,7 +46,7 @@ spec: replicas: {{ coalesce .Values.controller.replicas .Values.replicaCount | int | default 1 }} {{- end }} selector: - matchLabels: {{ include "cf-common-0.18.0.labels.matchLabels" . | nindent 6 }} + matchLabels: {{ include "cf-common-0.18.1.labels.matchLabels" . | nindent 6 }} {{- with .Values.controller.rollout }} analysis: {{ .analysis | toYaml | nindent 4 }} {{- end }} @@ -75,13 +75,13 @@ spec: {{- end }} template: metadata: - labels: {{ include "cf-common-0.18.0.labels.matchLabels" . | nindent 8 }} + labels: {{ include "cf-common-0.18.1.labels.matchLabels" . | nindent 8 }} {{- if .Values.podLabels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.podLabels "context" $) | nindent 8 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.podLabels "context" $) | nindent 8 }} {{- end }} {{- if .Values.podAnnotations }} annotations: - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.podAnnotations "context" $) | nindent 8 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.podAnnotations "context" $) | nindent 8 }} {{- end }} - spec: {{- include "cf-common-0.18.0.controller.pod" . | trim | nindent 6 -}} + spec: {{- include "cf-common-0.18.1.controller.pod" . | trim | nindent 6 -}} {{- end -}} diff --git a/charts/cf-common/templates/controller/_statefulset.tpl b/charts/cf-common/templates/controller/_statefulset.tpl index 5fac90f..4fcd955 100644 --- a/charts/cf-common/templates/controller/_statefulset.tpl +++ b/charts/cf-common/templates/controller/_statefulset.tpl @@ -2,10 +2,10 @@ Renders statefulset template Must be called from chart root context. Usage: -{{ include "cf-common-0.18.0.controller.statefulset" . }} +{{ include "cf-common-0.18.1.controller.statefulset" . }} */}} -{{- define "cf-common-0.18.0.controller.statefulset" -}} +{{- define "cf-common-0.18.1.controller.statefulset" -}} {{/*Merge .Values.controller with .Values.controller.statefulset*/}} {{- $controllerValues := deepCopy .Values.controller -}} @@ -27,7 +27,7 @@ Usage: {{- fail (printf "ERROR: %s is invalid Stateful Set podManagementPolicy!" $podManagementPolicy) -}} {{- end -}} -{{- $stsName := include "cf-common-0.18.0.names.fullname" . -}} +{{- $stsName := include "cf-common-0.18.1.names.fullname" . -}} {{- if and (hasKey .Values.controller "nameOverride") .Values.controller.nameOverride -}} {{- $stsName = printf "%v-%v" $stsName .Values.controller.nameOverride -}} {{- end -}} @@ -37,21 +37,21 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: {{ $stsName }} - labels: {{ include "cf-common-0.18.0.labels.standard" . | nindent 4 }} + labels: {{ include "cf-common-0.18.1.labels.standard" . | nindent 4 }} {{- if .Values.controller.labels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.controller.labels "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.controller.labels "context" $) | nindent 4 }} {{- end }} {{- if .Values.controller.annotations }} annotations: - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.controller.annotations "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.controller.annotations "context" $) | nindent 4 }} {{- end }} spec: revisionHistoryLimit: {{ .Values.controller.revisionHistoryLimit | int | default 5 }} replicas: {{ coalesce .Values.controller.replicas .Values.replicaCount | int | default 1 }} podManagementPolicy: {{ default "OrderedReady" .Values.controller.podManagementPolicy }} selector: - matchLabels: {{ include "cf-common-0.18.0.labels.matchLabels" . | nindent 6 }} - serviceName: {{ include "cf-common-0.18.0.names.fullname" . }} + matchLabels: {{ include "cf-common-0.18.1.labels.matchLabels" . | nindent 6 }} + serviceName: {{ include "cf-common-0.18.1.names.fullname" . }} updateStrategy: type: {{ $strategy }} {{- with .Values.controller.rollingUpdate }} @@ -62,25 +62,25 @@ spec: {{- end }} template: metadata: - labels: {{ include "cf-common-0.18.0.labels.matchLabels" . | nindent 8 }} + labels: {{ include "cf-common-0.18.1.labels.matchLabels" . | nindent 8 }} {{- if .Values.podLabels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.podLabels "context" $) | nindent 8 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.podLabels "context" $) | nindent 8 }} {{- end }} {{- if .Values.podAnnotations }} annotations: - {{- include "cf-common-0.18.0.tplrender" (dict "Values" .Values.podAnnotations "context" $) | nindent 8 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" .Values.podAnnotations "context" $) | nindent 8 }} {{- end }} - spec: {{- include "cf-common-0.18.0.controller.pod" . | trim | nindent 6 }} + spec: {{- include "cf-common-0.18.1.controller.pod" . | trim | nindent 6 }} volumeClaimTemplates: {{- range $claimIndex, $claimItem := .Values.volumeClaimTemplates }} {{- if not (eq $claimItem.enabled false ) }} - metadata: name: {{ $claimIndex }} {{- with ($claimItem.labels | default dict) }} - labels: {{- include "cf-common-0.18.0.tplrender" (dict "Values" . "context" $) | nindent 10 }} + labels: {{- include "cf-common-0.18.1.tplrender" (dict "Values" . "context" $) | nindent 10 }} {{- end }} {{- with ($claimItem.annotations | default dict) }} - annotations: {{- include "cf-common-0.18.0.tplrender" (dict "Values" . "context" $) | nindent 10 }} + annotations: {{- include "cf-common-0.18.1.tplrender" (dict "Values" . "context" $) | nindent 10 }} {{- end }} spec: {{- $claimSize := required (printf "size is required for PVC %v" $claimItem.name) $claimItem.size }} @@ -89,7 +89,7 @@ spec: resources: requests: storage: {{ $claimSize | quote }} - {{ include "cf-common-0.18.0.storageclass" ( dict "persistence" $claimItem "context" $) }} + {{ include "cf-common-0.18.1.storageclass" ( dict "persistence" $claimItem "context" $) }} {{- end }} {{- end }} {{- end -}} diff --git a/charts/cf-common/templates/controller/_volumes.tpl b/charts/cf-common/templates/controller/_volumes.tpl index 56643d1..e8eb7cd 100644 --- a/charts/cf-common/templates/controller/_volumes.tpl +++ b/charts/cf-common/templates/controller/_volumes.tpl @@ -2,10 +2,10 @@ Renders volumes in controller template. Called from pod template. Usage: -volumes: {{ include "cf-common-0.18.0.volumes" (dict "Values" .Values.volumes "context" $) | nindent }} +volumes: {{ include "cf-common-0.18.1.volumes" (dict "Values" .Values.volumes "context" $) | nindent }} */}} -{{- define "cf-common-0.18.0.volumes" -}} +{{- define "cf-common-0.18.1.volumes" -}} {{/* Restoring root $ context */}} {{- $ := .context -}} @@ -26,10 +26,10 @@ volumes: {{ include "cf-common-0.18.0.volumes" (dict "Values" .Values.volumes "c {{- if $volumeItem.enabled }} - name: {{ $volumeIndex }} - {{- $volumeName := printf "%s-%s" (include "cf-common-0.18.0.names.fullname" $) $volumeIndex -}} + {{- $volumeName := printf "%s-%s" (include "cf-common-0.18.1.names.fullname" $) $volumeIndex -}} {{- if and (or (hasKey $volumeItem "existingName") (hasKey $volumeItem "nameOverride")) (or $volumeItem.existingName $volumeItem.nameOverride) }} - {{- $volumeName = include "cf-common-0.18.0.tplrender" (dict "Values" (coalesce $volumeItem.nameOverride $volumeItem.existingName) "context" $) -}} + {{- $volumeName = include "cf-common-0.18.1.tplrender" (dict "Values" (coalesce $volumeItem.nameOverride $volumeItem.existingName) "context" $) -}} {{- end }} {{- if eq $volumeItem.type "configMap" }} diff --git a/charts/cf-common/templates/external-secrets/_external-secrets.tpl b/charts/cf-common/templates/external-secrets/_external-secrets.tpl index 3874cb4..ac134b7 100644 --- a/charts/cf-common/templates/external-secrets/_external-secrets.tpl +++ b/charts/cf-common/templates/external-secrets/_external-secrets.tpl @@ -1,4 +1,4 @@ -{{- define "cf-common-0.18.0.external-secrets" }} +{{- define "cf-common-0.18.1.external-secrets" }} {{- range $i, $secret := .Values.externalSecrets }} apiVersion: external-secrets.io/v1beta1 kind: ExternalSecret diff --git a/charts/cf-common/templates/ingress/_ingress.tpl b/charts/cf-common/templates/ingress/_ingress.tpl index 5c334e5..a3dff3e 100644 --- a/charts/cf-common/templates/ingress/_ingress.tpl +++ b/charts/cf-common/templates/ingress/_ingress.tpl @@ -1,9 +1,9 @@ {{/* Iterates over Ingress objects and calls render template. Must be called from chart root context. -{{- include "cf-common-0.18.0.ingress" . -}} +{{- include "cf-common-0.18.1.ingress" . -}} */}} -{{- define "cf-common-0.18.0.ingress" -}} +{{- define "cf-common-0.18.1.ingress" -}} {{- $primary := "" -}} {{- range $name, $ingress := .Values.ingress -}} {{- if and (hasKey $ingress "primary") $ingress.primary $ingress.enabled -}} @@ -26,7 +26,7 @@ Must be called from chart root context. {{- $_ := set $ingressValues "name" $name -}} {{- $_ := set $ "ObjectValues" (dict "ingress" $ingressValues) -}} - {{- include "cf-common-0.18.0.ingress.render" $ | nindent 0 -}} + {{- include "cf-common-0.18.1.ingress.render" $ | nindent 0 -}} {{- end -}} {{- end -}} {{- end -}} @@ -35,8 +35,8 @@ Must be called from chart root context. Renders Ingress objects. Called from the template above. */}} -{{- define "cf-common-0.18.0.ingress.render" -}} - {{- $fullName := include "cf-common-0.18.0.names.fullname" . -}} +{{- define "cf-common-0.18.1.ingress.render" -}} + {{- $fullName := include "cf-common-0.18.1.names.fullname" . -}} {{- $ingressName := $fullName -}} {{- $ingressItem := .Values.ingress -}} @@ -53,24 +53,24 @@ Called from the template above. {{- $defaultServiceName := $fullName -}} {{- $defaultServicePort := dict -}} {{- if .Values.service -}} - {{- $primaryService := get .Values.service (include "cf-common-0.18.0.service.primary" (dict "values" .Values.service)) -}} - {{- $defaultServicePort = get $primaryService.ports (include "cf-common-0.18.0.service.primaryPort" (dict "values" $primaryService)) -}} + {{- $primaryService := get .Values.service (include "cf-common-0.18.1.service.primary" (dict "values" .Values.service)) -}} + {{- $defaultServicePort = get $primaryService.ports (include "cf-common-0.18.1.service.primaryPort" (dict "values" $primaryService)) -}} {{- end -}} --- apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ $ingressName }} - labels: {{ include "cf-common-0.18.0.labels.standard" $ | nindent 4 }} + labels: {{ include "cf-common-0.18.1.labels.standard" $ | nindent 4 }} {{- if $ingressItem.labels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" $ingressItem.labels "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" $ingressItem.labels "context" $) | nindent 4 }} {{- end }} {{- if $ingressItem.annotations }} - annotations: {{- include "cf-common-0.18.0.tplrender" (dict "Values" $ingressItem.annotations "context" $) | nindent 4 }} + annotations: {{- include "cf-common-0.18.1.tplrender" (dict "Values" $ingressItem.annotations "context" $) | nindent 4 }} {{- end }} spec: {{- if $ingressItem.ingressClassName }} - ingressClassName: {{ include "cf-common-0.18.0.tplrender" (dict "Values" $ingressItem.ingressClassName "context" $) }} + ingressClassName: {{ include "cf-common-0.18.1.tplrender" (dict "Values" $ingressItem.ingressClassName "context" $) }} {{- end }} {{- if $ingressItem.tls }} tls: @@ -80,10 +80,10 @@ spec: {{- range $ingressItem.tls }} - hosts: {{- range .hosts }} - - {{ include "cf-common-0.18.0.tplrender" (dict "Values" . "context" $) | quote }} + - {{ include "cf-common-0.18.1.tplrender" (dict "Values" . "context" $) | quote }} {{- end }} {{- if .secretName }} - secretName: {{ include "cf-common-0.18.0.tplrender" (dict "Values" .secretName "context" $) | quote}} + secretName: {{ include "cf-common-0.18.1.tplrender" (dict "Values" .secretName "context" $) | quote}} {{- end }} {{- end }} {{- end }} @@ -92,7 +92,7 @@ spec: {{- fail (printf "ERROR: ingress.%s.hosts must be a list!" $ingressItem.name) }} {{- end }} {{- range $ingressItem.hosts }} - - host: {{ include "cf-common-0.18.0.tplrender" (dict "Values" .host "context" $) | quote }} + - host: {{ include "cf-common-0.18.1.tplrender" (dict "Values" .host "context" $) | quote }} http: paths: {{- if not (kindIs "slice" .paths) }} @@ -105,13 +105,13 @@ spec: {{- $service = default $service .service.name -}} {{- $port = default $port .service.port -}} {{- end }} - - path: {{ include "cf-common-0.18.0.tplrender" (dict "Values" .path "context" $) | quote }} + - path: {{ include "cf-common-0.18.1.tplrender" (dict "Values" .path "context" $) | quote }} pathType: {{ default "ImplementationSpecific" .pathType }} backend: service: - name: {{ include "cf-common-0.18.0.tplrender" (dict "Values" $service "context" $) }} + name: {{ include "cf-common-0.18.1.tplrender" (dict "Values" $service "context" $) }} port: - number: {{ include "cf-common-0.18.0.tplrender" (dict "Values" $port "context" $) }} + number: {{ include "cf-common-0.18.1.tplrender" (dict "Values" $port "context" $) }} {{- end }} {{- end }} {{- end -}} diff --git a/charts/cf-common/templates/ingress/_primary.tpl b/charts/cf-common/templates/ingress/_primary.tpl index 089eb64..dd40f55 100644 --- a/charts/cf-common/templates/ingress/_primary.tpl +++ b/charts/cf-common/templates/ingress/_primary.tpl @@ -2,9 +2,9 @@ Return the name of the primary ingress object. Called from ingress template. Usage: -{{ include "cf-common-0.18.0.ingress.primary" (dict "values" .Values.ingress ) }} +{{ include "cf-common-0.18.1.ingress.primary" (dict "values" .Values.ingress ) }} */}} -{{- define "cf-common-0.18.0.ingress.primary" -}} +{{- define "cf-common-0.18.1.ingress.primary" -}} {{- $result := "" -}} {{- range $name, $ingress := .values -}} {{- if and (hasKey $ingress "primary") $ingress.primary $ingress.enabled -}} diff --git a/charts/cf-common/templates/persistence/_pvc.tpl b/charts/cf-common/templates/persistence/_pvc.tpl index 16e9d09..cb9a260 100644 --- a/charts/cf-common/templates/persistence/_pvc.tpl +++ b/charts/cf-common/templates/persistence/_pvc.tpl @@ -2,33 +2,33 @@ Renders PersistentVolumeClaim objects. Must be called from chart root context. Usage: -{{- include "cf-common-0.18.0.pvc" . -}} +{{- include "cf-common-0.18.1.pvc" . -}} */}} -{{- define "cf-common-0.18.0.pvc" -}} +{{- define "cf-common-0.18.1.pvc" -}} {{- range $pvcIndex, $pvcItem := .Values.persistence }} {{- if and (not $pvcItem.existingClaim) (eq (default "pvc" $pvcItem.type) "pvc") $pvcItem.enabled }} -{{- $pvcName := printf "%s-%s" (include "cf-common-0.18.0.names.fullname" $) $pvcIndex }} +{{- $pvcName := printf "%s-%s" (include "cf-common-0.18.1.names.fullname" $) $pvcIndex }} {{- if and (hasKey $pvcItem "nameOverride") $pvcItem.nameOverride }} -{{- $pvcName = include "cf-common-0.18.0.tplrender" (dict "Values" $pvcItem.nameOverride "context" $) }} +{{- $pvcName = include "cf-common-0.18.1.tplrender" (dict "Values" $pvcItem.nameOverride "context" $) }} {{- end }} --- kind: PersistentVolumeClaim apiVersion: v1 metadata: name: {{ $pvcName }} - labels: {{ include "cf-common-0.18.0.labels.standard" $ | nindent 4 }} + labels: {{ include "cf-common-0.18.1.labels.standard" $ | nindent 4 }} {{- if $pvcItem.labels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" $pvcItem.labels "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" $pvcItem.labels "context" $) | nindent 4 }} {{- end }} annotations: {{- if $pvcItem.retain }} "helm.sh/resource-policy": keep {{- end }} {{- if $pvcItem.annotations }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" $pvcItem.annotations "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" $pvcItem.annotations "context" $) | nindent 4 }} {{- end }} spec: {{- $pvcSize := required (printf "size is required for PVC %v" $pvcName) $pvcItem.size }} @@ -37,7 +37,7 @@ spec: resources: requests: storage: {{ $pvcSize | quote }} - {{ include "cf-common-0.18.0.storageclass" ( dict "persistence" $pvcItem "context" $) }} + {{ include "cf-common-0.18.1.storageclass" ( dict "persistence" $pvcItem "context" $) }} {{- if $pvcItem.volumeName }} volumeName: {{ $pvcItem.volumeName | quote }} {{- end }} diff --git a/charts/cf-common/templates/persistence/_storage.tpl b/charts/cf-common/templates/persistence/_storage.tpl index 58a5351..1471b6a 100644 --- a/charts/cf-common/templates/persistence/_storage.tpl +++ b/charts/cf-common/templates/persistence/_storage.tpl @@ -1,9 +1,9 @@ {{/* Return the proper Storage Class. Called from pvc template. Root $ context must be passed. -{{ include "cf-common-0.18.0.storageclass" ( dict "persistence" .Values.persistence.data "context" $) }} +{{ include "cf-common-0.18.1.storageclass" ( dict "persistence" .Values.persistence.data "context" $) }} */}} -{{- define "cf-common-0.18.0.storageclass" -}} +{{- define "cf-common-0.18.1.storageclass" -}} {{/* Restoring root $ context */}} {{- $ := .context -}} diff --git a/charts/cf-common/templates/render/_all.tpl b/charts/cf-common/templates/render/_all.tpl index cf82203..d474fda 100644 --- a/charts/cf-common/templates/render/_all.tpl +++ b/charts/cf-common/templates/render/_all.tpl @@ -2,14 +2,14 @@ Render all underlying templates */}} -{{- define "cf-common-0.18.0.all" -}} +{{- define "cf-common-0.18.1.all" -}} -{{- include "cf-common-0.18.0.controller" . -}} -{{- include "cf-common-0.18.0.service" . -}} -{{- include "cf-common-0.18.0.configmaps" . -}} -{{- include "cf-common-0.18.0.secrets" . -}} -{{- include "cf-common-0.18.0.serviceaccount" . -}} -{{- include "cf-common-0.18.0.rbac" . -}} -{{- include "cf-common-0.18.0.pvc" . -}} +{{- include "cf-common-0.18.1.controller" . -}} +{{- include "cf-common-0.18.1.service" . -}} +{{- include "cf-common-0.18.1.configmaps" . -}} +{{- include "cf-common-0.18.1.secrets" . -}} +{{- include "cf-common-0.18.1.serviceaccount" . -}} +{{- include "cf-common-0.18.1.rbac" . -}} +{{- include "cf-common-0.18.1.pvc" . -}} {{- end -}} diff --git a/charts/cf-common/templates/render/_configmaps.tpl b/charts/cf-common/templates/render/_configmaps.tpl index 3cb8506..60dab4d 100644 --- a/charts/cf-common/templates/render/_configmaps.tpl +++ b/charts/cf-common/templates/render/_configmaps.tpl @@ -1,31 +1,31 @@ {{/* Renders ConfigMaps templates. Must be called from chart root context. -{{- include "cf-common-0.18.0.configmaps" . -}} +{{- include "cf-common-0.18.1.configmaps" . -}} */}} -{{- define "cf-common-0.18.0.configmaps" -}} +{{- define "cf-common-0.18.1.configmaps" -}} {{- range $configMapIndex, $configMapItem := .Values.configMaps }} {{- if $configMapItem.enabled }} -{{ $configMapName := printf "%s-%s" (include "cf-common-0.18.0.names.fullname" $) $configMapIndex }} +{{ $configMapName := printf "%s-%s" (include "cf-common-0.18.1.names.fullname" $) $configMapIndex }} --- kind: ConfigMap apiVersion: v1 metadata: name: {{ $configMapName }} - labels: {{ include "cf-common-0.18.0.labels.standard" $ | nindent 4 }} + labels: {{ include "cf-common-0.18.1.labels.standard" $ | nindent 4 }} {{- if $configMapItem.labels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" $configMapItem.labels "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" $configMapItem.labels "context" $) | nindent 4 }} {{- end }} {{- if $configMapItem.annotations }} - annotations: {{- include "cf-common-0.18.0.tplrender" (dict "Values" $configMapItem.annotations "context" $) | nindent 4 }} + annotations: {{- include "cf-common-0.18.1.tplrender" (dict "Values" $configMapItem.annotations "context" $) | nindent 4 }} {{- end }} {{- if not ( or (kindIs "map" $configMapItem.data) (kindIs "string" $configMapItem.data)) }} {{- fail (printf "ERROR: configMaps.%s.data must be a map or multiline string!" $configMapIndex) }} {{- end }} -data: {{ include "cf-common-0.18.0.tplrender" (dict "Values" $configMapItem.data "context" $) | nindent 2 }} +data: {{ include "cf-common-0.18.1.tplrender" (dict "Values" $configMapItem.data "context" $) | nindent 2 }} {{- end }} {{- end }} diff --git a/charts/cf-common/templates/render/_extra_resources.tpl b/charts/cf-common/templates/render/_extra_resources.tpl index 42b09d3..e3e03c6 100644 --- a/charts/cf-common/templates/render/_extra_resources.tpl +++ b/charts/cf-common/templates/render/_extra_resources.tpl @@ -2,16 +2,16 @@ Renders Extra objects defined at .Values.extraResources Must be called from chart root context. Usage: -{{- include "cf-common-0.18.0.extraResources" . -}} +{{- include "cf-common-0.18.1.extraResources" . -}} */}} -{{- define "cf-common-0.18.0.extraResources" -}} +{{- define "cf-common-0.18.1.extraResources" -}} {{/* Restoring root $ context */}} {{- $ := .context -}} {{- range .Values.extraResources }} -{{ include "cf-common-0.18.0.tplrender" (dict "Values" . "context" $) }} +{{ include "cf-common-0.18.1.tplrender" (dict "Values" . "context" $) }} {{- end }} {{- end -}} diff --git a/charts/cf-common/templates/render/_hpa.tpl b/charts/cf-common/templates/render/_hpa.tpl index 3efb1dd..98dce9d 100644 --- a/charts/cf-common/templates/render/_hpa.tpl +++ b/charts/cf-common/templates/render/_hpa.tpl @@ -2,10 +2,10 @@ Renders HorizontalPodAutoscaler template. Must be called from chart root context. Usage: -{{- include "cf-common-0.18.0.hpa" . -}} +{{- include "cf-common-0.18.1.hpa" . -}} */}} -{{- define "cf-common-0.18.0.hpa" -}} +{{- define "cf-common-0.18.1.hpa" -}} {{- if .Values.hpa.enabled -}} @@ -19,11 +19,11 @@ Usage: {{- $mergedControllerValues := mergeOverwrite $globalControllerValues $defaultControllerValues -}} {{- $_ := set .Values "controller" (deepCopy $mergedControllerValues) -}} -apiVersion: {{ include "cf-common-0.18.0.apiVersion.autoscaling" . }} +apiVersion: {{ include "cf-common-0.18.1.apiVersion.autoscaling" . }} kind: HorizontalPodAutoscaler metadata: - name: {{ include "cf-common-0.18.0.names.fullname" . }} - labels: {{ include "cf-common-0.18.0.labels.standard" . | nindent 4 }} + name: {{ include "cf-common-0.18.1.names.fullname" . }} + labels: {{ include "cf-common-0.18.1.labels.standard" . | nindent 4 }} spec: scaleTargetRef: {{- if eq .Values.controller.type "deployment" }} @@ -33,7 +33,7 @@ spec: apiVersion: argoproj.io/v1alpha1 kind: Rollout {{- end }} - name: {{ include "cf-common-0.18.0.names.fullname" . }} + name: {{ include "cf-common-0.18.1.names.fullname" . }} minReplicas: {{ required "hpa.minReplicas is required!" .Values.hpa.minReplicas | int }} maxReplicas: {{ required "hpa.maxReplicas is required!" .Values.hpa.maxReplicas | int }} metrics: diff --git a/charts/cf-common/templates/render/_pdb.tpl b/charts/cf-common/templates/render/_pdb.tpl index 2926af9..03e158b 100644 --- a/charts/cf-common/templates/render/_pdb.tpl +++ b/charts/cf-common/templates/render/_pdb.tpl @@ -1,18 +1,18 @@ {{/* Renders PodDisruptionBudget object. Must be called from chart root context. -{{- include "cf-common-0.18.0.pdb" . -}} +{{- include "cf-common-0.18.1.pdb" . -}} */}} -{{- define "cf-common-0.18.0.pdb" -}} +{{- define "cf-common-0.18.1.pdb" -}} {{- if .Values.pdb.enabled -}} apiVersion: policy/v1 kind: PodDisruptionBudget metadata: - name: {{ include "cf-common-0.18.0.names.fullname" . }} - labels: {{ include "cf-common-0.18.0.labels.standard" . | nindent 4 }} + name: {{ include "cf-common-0.18.1.names.fullname" . }} + labels: {{ include "cf-common-0.18.1.labels.standard" . | nindent 4 }} spec: {{- if or .Values.pdb.minAvailable .Values.pdb.maxUnavailable }} {{- with .Values.pdb.minAvailable }} @@ -25,7 +25,7 @@ spec: {{- fail (printf "ERROR: pdb.minAvailable or pdb.maxUnavailable is required!" ) }} {{- end }} selector: - matchLabels: {{ include "cf-common-0.18.0.labels.matchLabels" . | nindent 6 }} + matchLabels: {{ include "cf-common-0.18.1.labels.matchLabels" . | nindent 6 }} {{- end -}} diff --git a/charts/cf-common/templates/render/_podMontor.tpl b/charts/cf-common/templates/render/_podMontor.tpl index c7308e9..a16b566 100644 --- a/charts/cf-common/templates/render/_podMontor.tpl +++ b/charts/cf-common/templates/render/_podMontor.tpl @@ -2,11 +2,11 @@ Renders Service Monitor objects. */}} -{{- define "cf-common-0.18.0.podMonitor" -}} +{{- define "cf-common-0.18.1.podMonitor" -}} {{- range $podMonitorIndex, $podMonitorItem := .Values.podMonitor -}} -{{- $podMonitorName := include "cf-common-0.18.0.names.fullname" $ -}} +{{- $podMonitorName := include "cf-common-0.18.1.names.fullname" $ -}} {{- if and (hasKey $podMonitorItem "nameOverride") $podMonitorItem.nameOverride -}} {{- $podMonitorName = printf "%v-%v" $podMonitorName $podMonitorItem.nameOverride -}} {{- end -}} @@ -20,24 +20,24 @@ apiVersion: monitoring.coreos.com/v1 kind: PodMonitor metadata: name: {{ $podMonitorName }} - labels: {{ include "cf-common-0.18.0.labels.standard" $ | nindent 4 }} + labels: {{ include "cf-common-0.18.1.labels.standard" $ | nindent 4 }} {{- if $podMonitorItem.labels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" $podMonitorItem.labels "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" $podMonitorItem.labels "context" $) | nindent 4 }} {{- end }} {{- if $podMonitorItem.annotations }} - annotations: {{- include "cf-common-0.18.0.tplrender" (dict "Values" $podMonitorItem.annotations "context" $) | nindent 4 }} + annotations: {{- include "cf-common-0.18.1.tplrender" (dict "Values" $podMonitorItem.annotations "context" $) | nindent 4 }} {{- end }} spec: selector: {{- if $podMonitorItem.selector }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" $podMonitorItem.selector "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" $podMonitorItem.selector "context" $) | nindent 4 }} {{- else }} matchLabels: - {{- include "cf-common-0.18.0.labels.matchLabels" $ | nindent 6 }} + {{- include "cf-common-0.18.1.labels.matchLabels" $ | nindent 6 }} {{- end }} {{- if $podMonitorItem.namespaceSelector }} namespaceSelector: - {{- include "cf-common-0.18.0.tplrender" (dict "Values" $podMonitorItem.namespaceSelector "context" $) | nindent 6 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" $podMonitorItem.namespaceSelector "context" $) | nindent 6 }} {{- else }} namespaceSelector: matchNames: diff --git a/charts/cf-common/templates/render/_rbac.tpl b/charts/cf-common/templates/render/_rbac.tpl index b44bef6..58a2abe 100644 --- a/charts/cf-common/templates/render/_rbac.tpl +++ b/charts/cf-common/templates/render/_rbac.tpl @@ -2,23 +2,23 @@ Renders ServiceAccount/Role/RoleBinding objects. Must be called from chart root context. Usage: -{{- include "cf-common-0.18.0.rbac" . -}} +{{- include "cf-common-0.18.1.rbac" . -}} */}} -{{- define "cf-common-0.18.0.rbac" -}} +{{- define "cf-common-0.18.1.rbac" -}} {{- if .Values.serviceAccount.enabled }} --- apiVersion: v1 kind: ServiceAccount metadata: - name: {{ default ( include "cf-common-0.18.0.names.fullname" $) .Values.serviceAccount.nameOverride }} - labels: {{ include "cf-common-0.18.0.labels.standard" . | nindent 4 }} + name: {{ default ( include "cf-common-0.18.1.names.fullname" $) .Values.serviceAccount.nameOverride }} + labels: {{ include "cf-common-0.18.1.labels.standard" . | nindent 4 }} {{- if .Values.serviceAccount.annotations }} - annotations: {{ include "cf-common-0.18.0.tplrender" (dict "Values" .Values.serviceAccount.annotations "context" $) | nindent 4 }} + annotations: {{ include "cf-common-0.18.1.tplrender" (dict "Values" .Values.serviceAccount.annotations "context" $) | nindent 4 }} {{- end }} secrets: - - name: {{ include "cf-common-0.18.0.names.fullname" $ }}-sa-token + - name: {{ include "cf-common-0.18.1.names.fullname" $ }}-sa-token {{- end }} @@ -27,22 +27,22 @@ secrets: apiVersion: rbac.authorization.k8s.io/v1 kind: {{ .Values.rbac.namespaced | ternary "Role" "ClusterRole" }} metadata: - name: {{ include "cf-common-0.18.0.names.fullname" $ }} - labels: {{ include "cf-common-0.18.0.labels.standard" . | nindent 4 }} -rules: {{ include "cf-common-0.18.0.tplrender" (dict "Values" .Values.rbac.rules "context" $) | nindent 2 }} + name: {{ include "cf-common-0.18.1.names.fullname" $ }} + labels: {{ include "cf-common-0.18.1.labels.standard" . | nindent 4 }} +rules: {{ include "cf-common-0.18.1.tplrender" (dict "Values" .Values.rbac.rules "context" $) | nindent 2 }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: {{ .Values.rbac.namespaced | ternary "RoleBinding" "ClusterRoleBinding" }} metadata: - name: {{ include "cf-common-0.18.0.names.fullname" $ }} - labels: {{ include "cf-common-0.18.0.labels.standard" . | nindent 4 }} + name: {{ include "cf-common-0.18.1.names.fullname" $ }} + labels: {{ include "cf-common-0.18.1.labels.standard" . | nindent 4 }} roleRef: kind: {{ .Values.rbac.namespaced | ternary "Role" "ClusterRole" }} - name: {{ include "cf-common-0.18.0.names.fullname" $ }} + name: {{ include "cf-common-0.18.1.names.fullname" $ }} apiGroup: rbac.authorization.k8s.io subjects: - kind: ServiceAccount - name: {{ default ( include "cf-common-0.18.0.names.fullname" $) .Values.serviceAccount.nameOverride }} + name: {{ default ( include "cf-common-0.18.1.names.fullname" $) .Values.serviceAccount.nameOverride }} namespace: {{ .Release.Namespace }} {{- end }} @@ -54,9 +54,9 @@ apiVersion: v1 kind: Secret type: kubernetes.io/service-account-token metadata: - name: {{ include "cf-common-0.18.0.names.fullname" $ }}-sa-token + name: {{ include "cf-common-0.18.1.names.fullname" $ }}-sa-token annotations: - kubernetes.io/service-account.name: {{ default ( include "cf-common-0.18.0.names.fullname" $) .Values.serviceAccount.nameOverride }} + kubernetes.io/service-account.name: {{ default ( include "cf-common-0.18.1.names.fullname" $) .Values.serviceAccount.nameOverride }} {{- end }} {{- end }} {{- end }} diff --git a/charts/cf-common/templates/render/_secrets.tpl b/charts/cf-common/templates/render/_secrets.tpl index 264db9c..d28e9fa 100644 --- a/charts/cf-common/templates/render/_secrets.tpl +++ b/charts/cf-common/templates/render/_secrets.tpl @@ -1,25 +1,25 @@ {{/* Renders Secrets objects. Must be called from chart root context. -{{- include "cf-common-0.18.0.secrets" . -}} +{{- include "cf-common-0.18.1.secrets" . -}} */}} -{{- define "cf-common-0.18.0.secrets" -}} +{{- define "cf-common-0.18.1.secrets" -}} {{- range $secretIndex, $secretItem := .Values.secrets }} {{- if $secretItem.enabled }} -{{- $secretName := printf "%s-%s" (include "cf-common-0.18.0.names.fullname" $) $secretIndex }} +{{- $secretName := printf "%s-%s" (include "cf-common-0.18.1.names.fullname" $) $secretIndex }} --- apiVersion: v1 kind: Secret metadata: name: {{ $secretName }} - labels: {{ include "cf-common-0.18.0.labels.standard" $ | nindent 4 }} + labels: {{ include "cf-common-0.18.1.labels.standard" $ | nindent 4 }} {{- if $secretItem.labels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" $secretItem.labels "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" $secretItem.labels "context" $) | nindent 4 }} {{- end }} {{- if $secretItem.annotations }} - annotations: {{- include "cf-common-0.18.0.tplrender" (dict "Values" $secretItem.annotations "context" $) | nindent 4 }} + annotations: {{- include "cf-common-0.18.1.tplrender" (dict "Values" $secretItem.annotations "context" $) | nindent 4 }} {{- end }} {{- with $secretItem.type }} type: {{ . }} @@ -28,7 +28,7 @@ type: {{ . }} {{- if not ( or (kindIs "map" $secretItem.stringData) (kindIs "string" $secretItem.stringData) ) }} {{- fail (printf "ERROR: secrets.%s.stringData must be a map or multiline string!" $secretIndex) }} {{- end }} -stringData: {{ include "cf-common-0.18.0.tplrender" (dict "Values" $secretItem.stringData "context" $) | nindent 2 }} +stringData: {{ include "cf-common-0.18.1.tplrender" (dict "Values" $secretItem.stringData "context" $) | nindent 2 }} {{- else if $secretItem.data }} {{- if not (kindIs "map" $secretItem.data ) }} {{- fail (printf "ERROR: secrets.%s.data must be a map" $secretIndex) }} diff --git a/charts/cf-common/templates/render/_serviceMonitor.tpl b/charts/cf-common/templates/render/_serviceMonitor.tpl index 328c27d..e32e81f 100644 --- a/charts/cf-common/templates/render/_serviceMonitor.tpl +++ b/charts/cf-common/templates/render/_serviceMonitor.tpl @@ -2,11 +2,11 @@ Renders Service Monitor objects. */}} -{{- define "cf-common-0.18.0.serviceMonitor" -}} +{{- define "cf-common-0.18.1.serviceMonitor" -}} {{- range $serviceMonitorIndex, $serviceMonitorItem := .Values.serviceMonitor -}} -{{- $serviceMonitorName := include "cf-common-0.18.0.names.fullname" $ -}} +{{- $serviceMonitorName := include "cf-common-0.18.1.names.fullname" $ -}} {{- if and (hasKey $serviceMonitorItem "nameOverride") $serviceMonitorItem.nameOverride -}} {{- $serviceMonitorName = printf "%v-%v" $serviceMonitorName $serviceMonitorItem.nameOverride -}} {{- end -}} @@ -20,24 +20,24 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: {{ $serviceMonitorName }} - labels: {{ include "cf-common-0.18.0.labels.standard" $ | nindent 4 }} + labels: {{ include "cf-common-0.18.1.labels.standard" $ | nindent 4 }} {{- if $serviceMonitorItem.labels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" $serviceMonitorItem.labels "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" $serviceMonitorItem.labels "context" $) | nindent 4 }} {{- end }} {{- if $serviceMonitorItem.annotations }} - annotations: {{- include "cf-common-0.18.0.tplrender" (dict "Values" $serviceMonitorItem.annotations "context" $) | nindent 4 }} + annotations: {{- include "cf-common-0.18.1.tplrender" (dict "Values" $serviceMonitorItem.annotations "context" $) | nindent 4 }} {{- end }} spec: selector: {{- if $serviceMonitorItem.selector }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" $serviceMonitorItem.selector "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" $serviceMonitorItem.selector "context" $) | nindent 4 }} {{- else }} matchLabels: - {{- include "cf-common-0.18.0.labels.matchLabels" $ | nindent 6 }} + {{- include "cf-common-0.18.1.labels.matchLabels" $ | nindent 6 }} {{- end }} {{- if $serviceMonitorItem.namespaceSelector }} namespaceSelector: - {{- include "cf-common-0.18.0.tplrender" (dict "Values" $serviceMonitorItem.namespaceSelector "context" $) | nindent 6 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" $serviceMonitorItem.namespaceSelector "context" $) | nindent 6 }} {{- else }} namespaceSelector: matchNames: diff --git a/charts/cf-common/templates/services/_primary_port.tpl b/charts/cf-common/templates/services/_primary_port.tpl index 8cbd3ea..c837453 100644 --- a/charts/cf-common/templates/services/_primary_port.tpl +++ b/charts/cf-common/templates/services/_primary_port.tpl @@ -2,9 +2,9 @@ Return the primary port for a given Service object. Called from ingress template. Usage: -{{ include "cf-common-0.18.0.service.primaryPort" (dict "values" .Values.service.main ) }} +{{ include "cf-common-0.18.1.service.primaryPort" (dict "values" .Values.service.main ) }} */}} -{{- define "cf-common-0.18.0.service.primaryPort" -}} +{{- define "cf-common-0.18.1.service.primaryPort" -}} {{- $result := "" -}} {{- range $name, $port := .values.ports -}} {{- if and (hasKey $port "primary") $port.primary -}} diff --git a/charts/cf-common/templates/services/_primary_svc.tpl b/charts/cf-common/templates/services/_primary_svc.tpl index d9cdc45..009f9c5 100644 --- a/charts/cf-common/templates/services/_primary_svc.tpl +++ b/charts/cf-common/templates/services/_primary_svc.tpl @@ -2,9 +2,9 @@ Return the primary service object. Called from ingress template. Usage: -{{ include "cf-common-0.18.0.service.primary" (dict "values" .Values.service) }} +{{ include "cf-common-0.18.1.service.primary" (dict "values" .Values.service) }} */}} -{{- define "cf-common-0.18.0.service.primary" -}} +{{- define "cf-common-0.18.1.service.primary" -}} {{- $result := "" -}} {{- range $name, $service := .values -}} diff --git a/charts/cf-common/templates/services/_services.tpl b/charts/cf-common/templates/services/_services.tpl index c05d876..a0daf91 100644 --- a/charts/cf-common/templates/services/_services.tpl +++ b/charts/cf-common/templates/services/_services.tpl @@ -2,16 +2,16 @@ Renders Services objects. Must be called from chart root context. Usage: -{{- include "cf-common-0.18.0.service" . -}} +{{- include "cf-common-0.18.1.service" . -}} */}} -{{- define "cf-common-0.18.0.service" }} +{{- define "cf-common-0.18.1.service" }} {{- if not (kindIs "map" .Values.service) }} {{- fail "ERROR: service block must be a map!" }} {{- end }} -{{- $primary := include "cf-common-0.18.0.service.primary" (dict "values" .Values.service) -}} +{{- $primary := include "cf-common-0.18.1.service.primary" (dict "values" .Values.service) -}} {{- range $serviceIndex, $serviceItem := .Values.service }} @@ -23,9 +23,9 @@ Usage: {{- end -}} {{- if eq $serviceIndex $primary }} - {{- $serviceName = include "cf-common-0.18.0.names.fullname" $ -}} + {{- $serviceName = include "cf-common-0.18.1.names.fullname" $ -}} {{- else }} - {{- $serviceName = printf "%s-%s" (include "cf-common-0.18.0.names.fullname" $) $serviceIndex -}} + {{- $serviceName = printf "%s-%s" (include "cf-common-0.18.1.names.fullname" $) $serviceIndex -}} {{- end }} {{- if $serviceItem.enabled }} @@ -34,12 +34,12 @@ apiVersion: v1 kind: Service metadata: name: {{ $serviceName }} - labels: {{ include "cf-common-0.18.0.labels.standard" $ | nindent 4 }} + labels: {{ include "cf-common-0.18.1.labels.standard" $ | nindent 4 }} {{- if $serviceItem.labels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" $serviceItem.labels "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" $serviceItem.labels "context" $) | nindent 4 }} {{- end }} {{- if $serviceItem.annotations }} - annotations: {{- include "cf-common-0.18.0.tplrender" (dict "Values" $serviceItem.annotations "context" $) | nindent 4 }} + annotations: {{- include "cf-common-0.18.1.tplrender" (dict "Values" $serviceItem.annotations "context" $) | nindent 4 }} {{- end }} spec: type: {{ $serviceType }} @@ -87,9 +87,9 @@ spec: nodePort: {{ $portItem.nodePort }} {{- end }} {{- end }} - selector: {{ include "cf-common-0.18.0.labels.matchLabels" $ | nindent 4 }} + selector: {{ include "cf-common-0.18.1.labels.matchLabels" $ | nindent 4 }} {{- if $serviceItem.extraSelectorLabels }} - {{- include "cf-common-0.18.0.tplrender" (dict "Values" $serviceItem.extraSelectorLabels "context" $) | nindent 4 }} + {{- include "cf-common-0.18.1.tplrender" (dict "Values" $serviceItem.extraSelectorLabels "context" $) | nindent 4 }} {{- end }} {{- end }} {{- end }}