From d693c45d570acd66d99e8d523fe838c087fcbe2b Mon Sep 17 00:00:00 2001 From: Andri Joos <andri@joos.io> Date: Sun, 2 Feb 2025 22:42:18 +0100 Subject: [PATCH] rename extra-ingress to ingress --- common/templates/_helpers.tpl | 4 ++-- common/templates/{_extra_ingress.tpl => _ingress.tpl} | 8 ++++---- example/templates/extra_ingress.yaml | 2 +- example/values.yaml | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) rename common/templates/{_extra_ingress.tpl => _ingress.tpl} (58%) diff --git a/common/templates/_helpers.tpl b/common/templates/_helpers.tpl index c86d105..9104e38 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 08e29a8..b1869a2 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 9485737..305e1de 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 1e60f88..072d497 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: -- GitLab