🔒️(helm) change domainon production

Add ingress in order to migrate from meet.numerique.gouv.fr to
visio.numerique.gouv.fr
This commit is contained in:
Jacques ROUSSEL
2024-09-23 14:06:42 +02:00
committed by aleb_the_flash
parent 1103902c12
commit 90c88a8bd3
3 changed files with 14 additions and 12 deletions

View File

@@ -8,9 +8,9 @@ backend:
argocd.argoproj.io/hook: PostSync argocd.argoproj.io/hook: PostSync
argocd.argoproj.io/hook-delete-policy: HookSucceeded argocd.argoproj.io/hook-delete-policy: HookSucceeded
envVars: envVars:
DJANGO_CSRF_TRUSTED_ORIGINS: https://meet.numerique.gouv.fr DJANGO_CSRF_TRUSTED_ORIGINS: https://visio.numerique.gouv.fr,https://meet.numerique.gouv.fr
DJANGO_CONFIGURATION: Production DJANGO_CONFIGURATION: Production
DJANGO_ALLOWED_HOSTS: meet.numerique.gouv.fr DJANGO_ALLOWED_HOSTS: visio.numerique.gouv.fr,meet.numerique.gouv.fr
DJANGO_SECRET_KEY: DJANGO_SECRET_KEY:
secretKeyRef: secretKeyRef:
name: backend name: backend
@@ -43,11 +43,11 @@ backend:
key: OIDC_RP_CLIENT_SECRET key: OIDC_RP_CLIENT_SECRET
OIDC_RP_SIGN_ALGO: RS256 OIDC_RP_SIGN_ALGO: RS256
OIDC_RP_SCOPES: "openid email" OIDC_RP_SCOPES: "openid email"
OIDC_REDIRECT_ALLOWED_HOSTS: https://meet.numerique.gouv.fr OIDC_REDIRECT_ALLOWED_HOSTS: https://visio.numerique.gouv.fr
OIDC_AUTH_REQUEST_EXTRA_PARAMS: "{'acr_values': 'eidas1'}" OIDC_AUTH_REQUEST_EXTRA_PARAMS: "{'acr_values': 'eidas1'}"
LOGIN_REDIRECT_URL: https://meet.numerique.gouv.fr LOGIN_REDIRECT_URL: https://visio.numerique.gouv.fr
LOGIN_REDIRECT_URL_FAILURE: https://meet.numerique.gouv.fr LOGIN_REDIRECT_URL_FAILURE: https://visio.numerique.gouv.fr
LOGOUT_REDIRECT_URL: https://meet.numerique.gouv.fr LOGOUT_REDIRECT_URL: https://visio.numerique.gouv.fr
DB_HOST: DB_HOST:
secretKeyRef: secretKeyRef:
name: postgresql.postgres.libre.sh name: postgresql.postgres.libre.sh
@@ -113,14 +113,14 @@ frontend:
ingress: ingress:
enabled: true enabled: true
host: meet.numerique.gouv.fr host: visio.numerique.gouv.fr
className: nginx className: nginx
annotations: annotations:
cert-manager.io/cluster-issuer: letsencrypt cert-manager.io/cluster-issuer: letsencrypt
ingressAdmin: ingressAdmin:
enabled: true enabled: true
host: meet.numerique.gouv.fr host: visio.numerique.gouv.fr
className: nginx className: nginx
annotations: annotations:
cert-manager.io/cluster-issuer: letsencrypt cert-manager.io/cluster-issuer: letsencrypt

View File

@@ -39,7 +39,7 @@ apiVersion: cert-manager.io/v1
kind: Certificate kind: Certificate
metadata: metadata:
name: transitional-tls name: transitional-tls
namespace: meet-staging namespace: {{ .Release.Namespace | quote }}
spec: spec:
dnsNames: dnsNames:
- {{ .Values.newDomain }} - {{ .Values.newDomain }}
@@ -47,7 +47,7 @@ spec:
issuerRef: issuerRef:
group: cert-manager.io group: cert-manager.io
kind: ClusterIssuer kind: ClusterIssuer
name: letsencrypt-prod name: {{ index .Values.ingress.annotations "cert-manager.io/cluster-issuer" }}
secretName: transitional-tls secretName: transitional-tls
usages: usages:
- digital signature - digital signature

View File

@@ -41,7 +41,6 @@ releases:
- addRedirect: {{ .Values | get "addRedirect" "False" }} - addRedirect: {{ .Values | get "addRedirect" "False" }}
enablePermanentRedirect: {{ .Values | get "enablePermanentRedirect" "False"}} enablePermanentRedirect: {{ .Values | get "enablePermanentRedirect" "False"}}
oldDomain: {{ .Values | get "oldDomain" "demo.com" }} oldDomain: {{ .Values | get "oldDomain" "demo.com" }}
tlsOldSecretName: {{ .Values | get "tlsOldSecretName" "tls"}}
newDomain: {{ .Values | get "newDomain" "demo.com" }} newDomain: {{ .Values | get "newDomain" "demo.com" }}
- name: meet - name: meet
@@ -74,7 +73,6 @@ environments:
addRedirect: True addRedirect: True
enablePermanentRedirect: True enablePermanentRedirect: True
oldDomain: meet-staging.beta.numerique.gouv.fr oldDomain: meet-staging.beta.numerique.gouv.fr
tlsOldSecretName: meet-tls
newDomain: visio-staging.beta.numerique.gouv.fr newDomain: visio-staging.beta.numerique.gouv.fr
secrets: secrets:
- env.d/{{ .Environment.Name }}/secrets.enc.yaml - env.d/{{ .Environment.Name }}/secrets.enc.yaml
@@ -86,5 +84,9 @@ environments:
production: production:
values: values:
- version: 0.0.1 - version: 0.0.1
addRedirect: True
enablePermanentRedirect: True
oldDomain: meet.numerique.gouv.fr
newDomain: visio.numerique.gouv.fr
secrets: secrets:
- env.d/{{ .Environment.Name }}/secrets.enc.yaml - env.d/{{ .Environment.Name }}/secrets.enc.yaml