diff --git a/.helm/templates/10-cm.yaml b/.helm/templates/10-cm.yaml index bf2de54..431a740 100644 --- a/.helm/templates/10-cm.yaml +++ b/.helm/templates/10-cm.yaml @@ -52,7 +52,7 @@ data: "deckhouse.ru" "ru"; "*.deckhouse.ru" "ru"; # for test environments - "deckhouse.ru.*" "ru"; + "deckhouse-ru.*" "ru"; default "en"; } diff --git a/.helm/templates/20-ingress.yaml b/.helm/templates/20-ingress.yaml index d8e679b..a4f4d07 100644 --- a/.helm/templates/20-ingress.yaml +++ b/.helm/templates/20-ingress.yaml @@ -33,7 +33,7 @@ spec: {{- if eq $.Values.werf.env "production" }} secretName: star-{{ .URL | replace "." "-" }} {{- else }} - secretName: tls-{{ .URL }} + secretName: {{ pluck $.Values.web.env $.Values.wildCertificateSecret | first | default $.Values.wildCertificateSecret._default }} {{- end }} rules: - host: {{ .URL }} diff --git a/.helm/values.yaml b/.helm/values.yaml index 7bb0f9d..6c64ea7 100644 --- a/.helm/values.yaml +++ b/.helm/values.yaml @@ -13,6 +13,10 @@ certificateClusterIssuer: _default: letsencrypt production: letsencrypt-nginx +wildCertificateSecret: + _default: wildcard-test-flant-dev + web-stage: wildcard-stage-flant-dev + resources: requests: memory: diff --git a/go.mod b/go.mod index 1e12aa3..0bb668b 100644 --- a/go.mod +++ b/go.mod @@ -4,4 +4,4 @@ module github.com/deckhouse/website-development-platform go 1.24.2 -require github.com/deckhouse/hugo-web-product-module v0.1.5 // indirect +require github.com/deckhouse/hugo-web-product-module v0.1.6 // indirect diff --git a/go.sum b/go.sum index 41fef6a..985ae42 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,2 @@ -github.com/deckhouse/hugo-web-product-module v0.1.5 h1:pvP39VlRHwU/R5gYEZ7Gx/qybSgdZrlV59ypFZXJCrE= -github.com/deckhouse/hugo-web-product-module v0.1.5/go.mod h1:iLVlLSCkbOoi7RjYm5RjwAQi+Whs6DjSumhaH1GBjqw= +github.com/deckhouse/hugo-web-product-module v0.1.6 h1:Cwo75J7JJBsF+fGdUCrn2h80n+lmWUEv7HljeZ/yLiw= +github.com/deckhouse/hugo-web-product-module v0.1.6/go.mod h1:iLVlLSCkbOoi7RjYm5RjwAQi+Whs6DjSumhaH1GBjqw=