Skip to content
Snippets Groups Projects
Commit d7aac124 authored by Andri Joos's avatar Andri Joos :blush:
Browse files

move helper variables to variables sub-namespace

parent e0ec25bc
No related branches found
No related tags found
No related merge requests found
{{- 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 }}
{{/*
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) -}}
......
# 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 }}
......
{{- 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 }}
{{- 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 }}
{{- 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 }}
{{- 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 }}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment