rename extra-ingress to ingress

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 -}}

common/templates/_extra_ingress.tpl → common/templates/_ingress.tpl

-{{- 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 }}

example/templates/extra_ingress.yaml

 {{- 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 }}

example/values.yaml

-extraIngress:
-  name: example-extra-ingress
+ingress:
+  name: example-ingress
   ingressClassName: traefik
   rules:
     default: