Skip to content

Refactor ingress template for extraDomain support #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amalgamm merged 1 commit into from
Jun 22, 2026
Merged

Refactor ingress template for extraDomain support #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/statefull/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for statefull vality services
name: statefull
version: 1.0.34
version: 1.0.35
71 changes: 55 additions & 16 deletions charts/statefull/templates/ingress-alb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{{- if and .Values.ingress.enabled (eq .Values.ingress.ingressClassName "alb") }}
{{- $fullName := include "statefull.fullname" . }}
{{- $kVer := .Capabilities.KubeVersion.GitVersion }}
{{- $svcPort := .Values.ingress.servicePort }}

{{- /* generic ingress resource */ -}}
{{- define "statefull.ingress.resource" -}}
{{- $ := .ctx }}
{{- $ingressName := .name }}
{{- $secretName := .secretName }}
{{- $domains := .domains }}
{{- $annotations := .annotations }}
{{- $fullName := include "statefull.fullname" $ }}
{{- $kVer := $.Capabilities.KubeVersion.GitVersion }}
{{- $svcPort := $.Values.ingress.servicePort }}
---
{{- if semverCompare ">=1.19.0-0" $kVer }}
apiVersion: networking.k8s.io/v1
{{- else }}
Expand All @@ -11,32 +17,32 @@ apiVersion: networking.k8s.io/v1beta1
kind: Ingress

metadata:
name: {{ $fullName }}
name: {{ $ingressName }}
labels:
{{ include "statefull.labels" . | indent 4 }}
{{ include "statefull.labels" $ | indent 4 }}
annotations:
{{- with .Values.ingress.annotations }}
{{- with $annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if and .Values.ingress.tls.enabled .Values.ingress.tls.letsEncrypt.enabled }}
cert-manager.io/cluster-issuer: {{ .Values.ingress.tls.letsEncrypt.issuer }}
{{- if and $.Values.ingress.tls.enabled $.Values.ingress.tls.letsEncrypt.enabled }}
cert-manager.io/cluster-issuer: {{ $.Values.ingress.tls.letsEncrypt.issuer }}
{{- end }}

spec:
ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
ingressClassName: {{ $.Values.ingress.ingressClassName | quote }}

{{- if .Values.ingress.tls.enabled }}
{{- if $.Values.ingress.tls.enabled }}
tls:
- hosts:
{{- range $domain := .Values.ingress.rootDomains }}
{{- $host := include "stateless.ingress.fqdn" (dict "ctx" $ "domain" $domain) }}
{{- range $domain := $domains }}
{{- $host := include "statefull.ingress.fqdn" (dict "ctx" $ "domain" $domain) }}
- {{ $host | quote }}
{{- end }}
secretName: {{ include "stateless.ingress.secretName" $ | quote }}
secretName: {{ $secretName | quote }}
{{- end }}

rules:
{{- range $domain := .Values.ingress.rootDomains }}
{{- range $domain := $domains }}
{{- $host := include "statefull.ingress.fqdn" (dict "ctx" $ "domain" $domain) }}
- host: {{ $host | quote }}
http:
Expand Down Expand Up @@ -75,3 +81,36 @@ spec:
{{- end }}
{{- end }}
{{- end }}

{{- if and .Values.ingress.enabled (eq .Values.ingress.ingressClassName "alb") }}

{{- /* generate main ingess */ -}}
{{- $mainName := include "statefull.fullname" . }}
{{- $mainSecret := include "statefull.ingress.secretName" . }}
{{- include "statefull.ingress.resource" (dict "ctx" . "name" $mainName "secretName" $mainSecret "domains" .Values.ingress.rootDomains "annotations" .Values.ingress.annotations) }}
{{- end }}

{{- /* generate extra ingess */ -}}
{{- range $extra := .Values.ingress.extraDomains }}
{{- if $extra.enabled }}
{{- $extraName := printf "%s-%s" (include "statefull.fullname" $) $extra.name }}
{{- $extraSecret := printf "%s-%s" $extra.name (include "statefull.ingress.secretName" $) }}

{{- $baseAnnotations := default dict $.Values.ingress.annotations }}

{{- $customOverrides := dict }}
{{- if $extra.target }}
{{- $_ := set $customOverrides "external-dns.alpha.kubernetes.io/target" $extra.target }}
{{- $_ := set $customOverrides "external-dns.alpha.kubernetes.io/cloudflare-proxied" "false" }}
{{- end }}
{{- if $extra.group }}
{{- $_ := set $customOverrides "alb.ingress.kubernetes.io/group.name" $extra.group }}
{{- end }}

{{- $mergedAnnotations := merge $customOverrides $baseAnnotations }}
{{- $extraDomainsList := list $extra.domain }}

{{- include "statefull.ingress.resource" (dict "ctx" $ "name" $extraName "secretName" $extraSecret "domains" $extraDomainsList "annotations" $mergedAnnotations) }}
{{- end }}
{{- end }}

2 changes: 1 addition & 1 deletion charts/stateless/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v1
appVersion: "1.0"
description: A Helm chart for stateless vality services
name: stateless
version: 1.0.49
version: 1.0.50
69 changes: 54 additions & 15 deletions charts/stateless/templates/ingress-alb.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
{{- if and .Values.ingress.enabled (eq .Values.ingress.ingressClassName "alb") }}
{{- $fullName := include "stateless.fullname" . }}
{{- $kVer := .Capabilities.KubeVersion.GitVersion }}
{{- $svcPort := .Values.ingress.servicePort }}

{{- /* generic ingress resource */ -}}
{{- define "stateless.ingress.resource" -}}
{{- $ := .ctx }}
{{- $ingressName := .name }}
{{- $secretName := .secretName }}
{{- $domains := .domains }}
{{- $annotations := .annotations }}
{{- $fullName := include "stateless.fullname" $ }}
{{- $kVer := $.Capabilities.KubeVersion.GitVersion }}
{{- $svcPort := $.Values.ingress.servicePort }}
---
{{- if semverCompare ">=1.19.0-0" $kVer }}
apiVersion: networking.k8s.io/v1
{{- else }}
Expand All @@ -11,32 +17,32 @@ apiVersion: networking.k8s.io/v1beta1
kind: Ingress

metadata:
name: {{ $fullName }}
name: {{ $ingressName }}
labels:
{{ include "stateless.labels" . | indent 4 }}
{{ include "stateless.labels" $ | indent 4 }}
annotations:
{{- with .Values.ingress.annotations }}
{{- with $annotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if and .Values.ingress.tls.enabled .Values.ingress.tls.letsEncrypt.enabled }}
cert-manager.io/cluster-issuer: {{ .Values.ingress.tls.letsEncrypt.issuer }}
{{- if and $.Values.ingress.tls.enabled $.Values.ingress.tls.letsEncrypt.enabled }}
cert-manager.io/cluster-issuer: {{ $.Values.ingress.tls.letsEncrypt.issuer }}
{{- end }}

spec:
ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
ingressClassName: {{ $.Values.ingress.ingressClassName | quote }}

{{- if .Values.ingress.tls.enabled }}
{{- if $.Values.ingress.tls.enabled }}
tls:
- hosts:
{{- range $domain := .Values.ingress.rootDomains }}
{{- range $domain := $domains }}
{{- $host := include "stateless.ingress.fqdn" (dict "ctx" $ "domain" $domain) }}
- {{ $host | quote }}
{{- end }}
secretName: {{ include "stateless.ingress.secretName" $ | quote }}
secretName: {{ $secretName | quote }}
{{- end }}

rules:
{{- range $domain := .Values.ingress.rootDomains }}
{{- range $domain := $domains }}
{{- $host := include "stateless.ingress.fqdn" (dict "ctx" $ "domain" $domain) }}
- host: {{ $host | quote }}
http:
Expand Down Expand Up @@ -75,3 +81,36 @@ spec:
{{- end }}
{{- end }}
{{- end }}

{{- if and .Values.ingress.enabled (eq .Values.ingress.ingressClassName "alb") }}

{{- /* generate main ingess */ -}}
{{- $mainName := include "stateless.fullname" . }}
{{- $mainSecret := include "stateless.ingress.secretName" . }}
{{- include "stateless.ingress.resource" (dict "ctx" . "name" $mainName "secretName" $mainSecret "domains" .Values.ingress.rootDomains "annotations" .Values.ingress.annotations) }}
{{- end }}

{{- /* generate extra ingess */ -}}
{{- range $extra := .Values.ingress.extraDomains }}
{{- if $extra.enabled }}
{{- $extraName := printf "%s-%s" (include "stateless.fullname" $) $extra.name }}
{{- $extraSecret := printf "%s-%s" $extra.name (include "stateless.ingress.secretName" $) }}

{{- $baseAnnotations := default dict $.Values.ingress.annotations }}

{{- $customOverrides := dict }}
{{- if $extra.target }}
{{- $_ := set $customOverrides "external-dns.alpha.kubernetes.io/target" $extra.target }}
{{- $_ := set $customOverrides "external-dns.alpha.kubernetes.io/cloudflare-proxied" "false" }}
{{- end }}
{{- if $extra.group }}
{{- $_ := set $customOverrides "alb.ingress.kubernetes.io/group.name" $extra.group }}
{{- end }}

{{- $mergedAnnotations := merge $customOverrides $baseAnnotations }}
{{- $extraDomainsList := list $extra.domain }}

{{- include "stateless.ingress.resource" (dict "ctx" $ "name" $extraName "secretName" $extraSecret "domains" $extraDomainsList "annotations" $mergedAnnotations) }}
{{- end }}
{{- end }}

Loading