diff --git a/common/templates/_helpers.tpl b/common/templates/_helpers.tpl index c86d105293524b09987174aa715738003710930d..9104e38497f1d507a7cfdefc1171281e036e9bbe 100644 --- a/common/templates/_helpers.tpl +++ b/common/templates/_helpers.tpl @@ -26,7 +26,7 @@ Extra Ingress {{/* Extra Ingress Rules */}} -{{- define "common.variables.extra-ingress.rules" -}} +{{- define "common.variables.ingress.rules" -}} {{- $rules := list -}} {{- range $name, $rule := .Values.rules -}} {{- $rules = append $rules $rule -}} @@ -37,7 +37,7 @@ Extra Ingress Rules {{/* Extra Ingress TLS */}} -{{- define "common.variables.extra-ingress.tls" -}} +{{- define "common.variables.ingress.tls" -}} {{- $tlsDefinitions := list -}} {{- range $name, $tlsDefinition := .Values.tls -}} {{- $tlsDefinitions = append $tlsDefinitions $tlsDefinition -}} diff --git a/common/templates/_extra_ingress.tpl b/common/templates/_ingress.tpl similarity index 58% rename from common/templates/_extra_ingress.tpl rename to common/templates/_ingress.tpl index 08e29a87f00f4d9937302cb36bd9489a835c336c..b1869a2bea87fb0ee04ceb9edc0222e58c667783 100644 --- a/common/templates/_extra_ingress.tpl +++ b/common/templates/_ingress.tpl @@ -1,8 +1,8 @@ -{{- define "common.extra-ingress" -}} +{{- define "common.ingress" -}} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: {{ .Values.name | default "extra-ingress" | quote }} + name: {{ .Values.name | default "ingress" | quote }} {{- with .Values.annotations }} annotations: {{- toYaml . | nindent 4 }} @@ -14,8 +14,8 @@ spec: ingressClassName: {{ . | quote }} {{- end }} rules: - {{- (include "common.variables.extra-ingress.rules" .) | nindent 4 }} + {{- (include "common.variables.ingress.rules" .) | nindent 4 }} tls: - {{- (include "common.variables.extra-ingress.tls" .) | nindent 4 }} + {{- (include "common.variables.ingress.tls" .) | nindent 4 }} --- {{- end }} diff --git a/example/templates/extra_ingress.yaml b/example/templates/extra_ingress.yaml index 9485737b24ab16fb21d094a0745ca48e26fb3b8e..305e1debc63bda3b9567c2551937ec523e8a7352 100644 --- a/example/templates/extra_ingress.yaml +++ b/example/templates/extra_ingress.yaml @@ -1,3 +1,3 @@ {{- if .Values.extraIngress }} -{{ include "common.extra-ingress" (dict "Values" .Values.extraIngress "Chart" .Chart "Release" .Release) }} +{{ include "common.ingress" (dict "Values" .Values.extraIngress "Chart" .Chart "Release" .Release) }} {{- end }} diff --git a/example/values.yaml b/example/values.yaml index 1e60f8860839657950521cd27faef00e54d532d1..072d49723bef395c7ae8fc14b6acf28d4a78ddc3 100644 --- a/example/values.yaml +++ b/example/values.yaml @@ -1,5 +1,5 @@ -extraIngress: - name: example-extra-ingress +ingress: + name: example-ingress ingressClassName: traefik rules: default: