From d7aac12476f84d358402c26b82baf9f9a7cc09b4 Mon Sep 17 00:00:00 2001 From: Andri Joos <andri@joos.io> Date: Fri, 17 Jan 2025 15:48:45 +0100 Subject: [PATCH] move helper variables to variables sub-namespace --- common/templates/_extra_ingress.tpl | 8 ++++---- common/templates/_helpers.tpl | 12 ++++++------ common/templates/_persistentvolume.tpl | 4 ++-- common/templates/_secret.tpl | 6 +++--- example/templates/extra_ingress.yaml | 2 +- example/templates/persistentvolumes.yaml | 2 +- example/templates/secrets.yaml | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/common/templates/_extra_ingress.tpl b/common/templates/_extra_ingress.tpl index 8760a61..08e29a8 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 2fce9c4..4bbcda7 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 969e2d4..6f56c58 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 c31f290..53b6ac8 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 6d6f989..9485737 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 bf4912e..950f8fb 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 7ffc71e..afb9199 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 }} -- GitLab