Skip to content

chore: update ingress tls #846

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
odiora merged 2 commits into from
Jun 2, 2026
Merged

chore: update ingress tls #846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffa0d91
helm: update ingress tls
odiora Jun 1, 2026
e89abf5
chore: resolve remarks
odiora Jun 2, 2026
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
16 changes: 4 additions & 12 deletions .helm/templates/20-ingress-tuf-router.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{{- if hasPrefix "review" .Values.werf.env }}
{{- $host = ( printf "%s.%s" .Values.werf.env (pluck "dev" .Values.host | first | default .Values.host._default ) | lower ) }}
{{- end }}
{{- $targetCluster := include "targetCluster" . }}
{{- $ruHost := pluck .Values.werf.env .Values.ruHost | first | default (printf "ru.%s" $host) }}
{{- $ingressSecretName := pluck .Values.werf.env .Values.ingressSecretName | first | default .Values.ingressSecretName._default }}

apiVersion: networking.k8s.io/v1
kind: Ingress
Expand All @@ -14,20 +14,15 @@ spec:
ingressClassName: {{ include "ingressClassName" . }}
tls:
- hosts:
- {{ $host }}
{{- if eq .Values.werf.env "production" }}
{{- if eq $targetCluster "ru" }}
- {{ $ruHost }}
secretName: {{ $ingressSecretName }}
{{- else }}
- {{ $host }}
{{- end }}
secretName: tls-{{ $host }}
{{- else }}
- {{ $host }}
- ru-{{ $host }}
secretName: {{ pluck .Values.werf.env .Values.ingressSecretName | first | default .Values.ingressSecretName._default }}
secretName: {{ $ingressSecretName }}
{{- end }}
rules:
{{- if or (ne .Values.werf.env "production") (eq $targetCluster "eu") }}
- host: {{ $host }}
http:
paths:
Expand All @@ -45,9 +40,7 @@ spec:
name: tuf-router
port:
name: http
{{- end }}
{{- if eq .Values.werf.env "production" }}
{{- if eq $targetCluster "ru" }}
- host: {{ $ruHost }}
http:
paths:
Expand All @@ -65,7 +58,6 @@ spec:
name: tuf-router
port:
name: http
{{- end }}
{{- else }}
- host: ru-{{ $host }}
http:
Expand Down
40 changes: 5 additions & 35 deletions .helm/templates/20-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
{{- if hasPrefix "review" .Values.werf.env }}
{{- $host = ( printf "%s.%s" .Values.werf.env (pluck "dev" .Values.host | first | default .Values.host._default ) | lower ) }}
{{- end }}
{{- $targetCluster := include "targetCluster" . }}
{{- $ruHost := pluck .Values.werf.env .Values.ruHost | first | default (printf "ru.%s" $host) }}
{{- $wwwHost := printf "www.%s" $host }}
{{- $ingressSecretName := pluck .Values.werf.env .Values.ingressSecretName | first | default .Values.ingressSecretName._default }}
{{- if eq .Values.werf.env "production" }}
---
apiVersion: networking.k8s.io/v1
Expand All @@ -22,15 +22,11 @@ spec:
ingressClassName: {{ include "ingressClassName" . }}
tls:
- hosts:
{{- if eq $targetCluster "ru" }}
- {{ $ruHost }}
{{- else }}
- {{ $host }}
- {{ $wwwHost }}
{{- end }}
secretName: tls-{{ $host }}
- {{ $ruHost }}
secretName: {{ $ingressSecretName }}
rules:
{{- if eq $targetCluster "eu" }}
- host: {{ $host }}
http:
paths:
Expand All @@ -41,7 +37,6 @@ spec:
name: backend
port:
name: http
{{- else }}
- host: {{ $ruHost }}
http:
paths:
Expand All @@ -52,7 +47,6 @@ spec:
name: backend
port:
name: http
{{- end }}
{{- else }}
---
apiVersion: networking.k8s.io/v1
Expand All @@ -73,7 +67,7 @@ spec:
tls:
- hosts:
- {{ $host }}
secretName: {{ pluck .Values.werf.env .Values.ingressSecretName | first | default .Values.ingressSecretName._default }}
secretName: {{ $ingressSecretName }}
rules:
- host: {{ $host }}
http:
Expand Down Expand Up @@ -104,7 +98,7 @@ spec:
tls:
- hosts:
- ru-{{ $host }}
secretName: {{ pluck .Values.werf.env .Values.ingressSecretName | first | default .Values.ingressSecretName._default }}
secretName: {{ $ingressSecretName }}
rules:
- host: ru-{{ $host }}
http:
Expand All @@ -118,27 +112,3 @@ spec:
name: http
{{- end }}

{{- if eq .Values.werf.env "production" }}
---
apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
name: {{ .Chart.Name }}-cert
spec:
secretName: tls-{{ $host }}
issuerRef:
kind: ClusterIssuer
name: {{ include "certificateIssuerName" . }}
{{- if eq $targetCluster "ru" }}
commonName: {{ $ruHost }}
{{- else }}
commonName: {{ $host }}
{{- end }}
dnsNames:
{{- if eq $targetCluster "ru" }}
- {{ $ruHost }}
{{- else }}
- {{ $host }}
- {{ $wwwHost }}
{{- end }}
{{- end }}
4 changes: 1 addition & 3 deletions .helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,12 @@ ingressClassName:
_default: "nginx"
production: "standalone-geo"

certificateIssuerName:
_default: letsencrypt
production: letsencrypt-standalone-geo

ingressSecretName:
_default: wildcard-dev-flant-dev
test: wildcard-test-flant-dev
stage: wildcard-stage-flant-dev
production: tls-werf-io

resources:
requests:
Expand Down
Loading