diff --git a/common/templates/_extra_ingress.tpl b/common/templates/_extra_ingress.tpl index 8760a611cbdc1bbcdf46548750c29c3b031da4ec..08e29a87f00f4d9937302cb36bd9489a835c336c 100644 --- a/common/templates/_extra_ingress.tpl +++ b/common/templates/_extra_ingress.tpl @@ -1,4 +1,4 @@ -{{- define "common.extra-ingress.ingress" -}} +{{- define "common.extra-ingress" -}} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -8,14 +8,14 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "common.variables.labels" . | nindent 4 }} spec: {{- with .Values.ingressClassName }} ingressClassName: {{ . | quote }} {{- end }} rules: - {{- (include "common.extra-ingress.rules" .) | nindent 4 }} + {{- (include "common.variables.extra-ingress.rules" .) | nindent 4 }} tls: - {{- (include "common.extra-ingress.tls" .) | nindent 4 }} + {{- (include "common.variables.extra-ingress.tls" .) | nindent 4 }} --- {{- end }} diff --git a/common/templates/_helpers.tpl b/common/templates/_helpers.tpl index 2fce9c4016776dc6eb8703d9d2b4877c24b55b58..4bbcda7870accc725a84787a9bd65324b987cc7b 100644 --- a/common/templates/_helpers.tpl +++ b/common/templates/_helpers.tpl @@ -1,15 +1,15 @@ {{/* Create chart name and version as used by the chart label. */}} -{{- define "common.chart" -}} +{{- define "common.variables.chart" -}} {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} {{- end }} {{/* Common labels */}} -{{- define "common.labels" -}} -helm.sh/chart: {{ include "common.chart" . }} +{{- define "common.variables.labels" -}} +helm.sh/chart: {{ include "common.variables.chart" . }} {{- if .Chart.AppVersion }} app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} {{- end }} @@ -23,7 +23,7 @@ Extra Ingress {{/* Extra Ingress Rules */}} -{{- define "common.extra-ingress.rules" -}} +{{- define "common.variables.extra-ingress.rules" -}} {{- $rules := list -}} {{- range $name, $rule := .Values.rules -}} {{- $rules = append $rules $rule -}} @@ -34,7 +34,7 @@ Extra Ingress Rules {{/* Extra Ingress TLS */}} -{{- define "common.extra-ingress.tls" -}} +{{- define "common.variables.extra-ingress.tls" -}} {{- $tlsDefinitions := list -}} {{- range $name, $tlsDefinition := .Values.tls -}} {{- $tlsDefinitions = append $tlsDefinitions $tlsDefinition -}} @@ -49,7 +49,7 @@ Secret {{/* Secret data */}} -{{- define "common.secret.data" -}} +{{- define "common.variables.secret.data" -}} {{- $data := dict -}} {{- range $key, $value := .Values.data -}} {{- $data = merge $data (dict $key $value) -}} diff --git a/common/templates/_persistentvolume.tpl b/common/templates/_persistentvolume.tpl index 969e2d4d98d94ac6944159e6ae205a9cd4830220..6f56c5877209d89c0bb0e42ba15484e1833bff03 100644 --- a/common/templates/_persistentvolume.tpl +++ b/common/templates/_persistentvolume.tpl @@ -1,5 +1,5 @@ # Only use for static provisioning, dynamic provisioning will provision the pv upon request -{{- define "common.persistentvolume.persistentvolume" -}} +{{- define "common.persistentvolume" -}} apiVersion: v1 kind: PersistentVolume metadata: @@ -9,7 +9,7 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "common.variables.labels" . | nindent 4 }} spec: capacity: storage: {{ .Values.size }} diff --git a/common/templates/_secret.tpl b/common/templates/_secret.tpl index c31f290803b7a0728219650cf99f1028d3747d5a..53b6ac8b858d83f30a12e6d857b41218656b32f4 100644 --- a/common/templates/_secret.tpl +++ b/common/templates/_secret.tpl @@ -1,4 +1,4 @@ -{{- define "common.secret.secret" -}} +{{- define "common.secret" -}} apiVersion: v1 kind: Secret metadata: @@ -8,9 +8,9 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} labels: - {{- include "common.labels" . | nindent 4 }} + {{- include "common.variables.labels" . | nindent 4 }} type: {{ .Values.type | default "Opaque" }} data: - {{- (include "common.secret.data" .) | nindent 2 }} + {{- (include "common.variables.secret.data" .) | nindent 2 }} --- {{- end }} diff --git a/example/templates/extra_ingress.yaml b/example/templates/extra_ingress.yaml index 6d6f98941a93113b7a2039b53d239c9dd53a9643..9485737b24ab16fb21d094a0745ca48e26fb3b8e 100644 --- a/example/templates/extra_ingress.yaml +++ b/example/templates/extra_ingress.yaml @@ -1,3 +1,3 @@ {{- if .Values.extraIngress }} -{{ include "common.extra-ingress.ingress" (dict "Values" .Values.extraIngress "Chart" .Chart "Release" .Release) }} +{{ include "common.extra-ingress" (dict "Values" .Values.extraIngress "Chart" .Chart "Release" .Release) }} {{- end }} diff --git a/example/templates/persistentvolumes.yaml b/example/templates/persistentvolumes.yaml index bf4912ed6995514fd02442b2fb0fa545ebbd1b3e..950f8fb5e736630c988841a6dbf8090b4acce4e9 100644 --- a/example/templates/persistentvolumes.yaml +++ b/example/templates/persistentvolumes.yaml @@ -1,3 +1,3 @@ {{- if .Values.volumes.persistentVolumes.example }} -{{ include "common.persistentvolume.persistentvolume" (dict "Values" .Values.volumes.persistentVolumes.example "Chart" .Chart "Release" .Release) }} +{{ include "common.persistentvolume" (dict "Values" .Values.volumes.persistentVolumes.example "Chart" .Chart "Release" .Release) }} {{- end }} diff --git a/example/templates/secrets.yaml b/example/templates/secrets.yaml index 7ffc71e2f87be2d2e9a962a7d30fec382c5dd7e4..afb9199bdb22f24b56aa45497fb0bbb15d80f3f0 100644 --- a/example/templates/secrets.yaml +++ b/example/templates/secrets.yaml @@ -1,6 +1,6 @@ {{- if .Values.secrets.secret0 }} -{{ include "common.secret.secret" (dict "Values" .Values.secrets.secret0 "Chart" .Chart "Release" .Release) }} +{{ include "common.secret" (dict "Values" .Values.secrets.secret0 "Chart" .Chart "Release" .Release) }} {{- end }} {{- if .Values.secrets.secret1 }} -{{ include "common.secret.secret" (dict "Values" .Values.secrets.secret1 "Chart" .Chart "Release" .Release) }} +{{ include "common.secret" (dict "Values" .Values.secrets.secret1 "Chart" .Chart "Release" .Release) }} {{- end }}