From 271389d4593d4bb9da76271ae149f7aedd986ba8 Mon Sep 17 00:00:00 2001 From: lebaudantoine Date: Mon, 23 Sep 2024 18:31:05 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A8(helm)=20fix=20linter=20errors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Initial set-up errors. Fixed them. Removed unused Preprod environment, as secrets are not configured yet, it raises an error. --- .../env.d/preprod/values.meet.yaml.gotmpl | 136 ------------------ src/helm/helmfile.yaml | 55 ++++--- 2 files changed, 25 insertions(+), 166 deletions(-) delete mode 100644 src/helm/env.d/preprod/values.meet.yaml.gotmpl diff --git a/src/helm/env.d/preprod/values.meet.yaml.gotmpl b/src/helm/env.d/preprod/values.meet.yaml.gotmpl deleted file mode 100644 index 7f4d70a8..00000000 --- a/src/helm/env.d/preprod/values.meet.yaml.gotmpl +++ /dev/null @@ -1,136 +0,0 @@ -image: - repository: lasuite/meet-backend - pullPolicy: Always - tag: "v0.1.6" - -backend: - migrateJobAnnotations: - argocd.argoproj.io/hook: PreSync - argocd.argoproj.io/hook-delete-policy: HookSucceeded - envVars: - DJANGO_CSRF_TRUSTED_ORIGINS: http://meet-preprod.beta.numerique.gouv.fr,https://meet-preprod.beta.numerique.gouv.fr - DJANGO_CONFIGURATION: Production - DJANGO_ALLOWED_HOSTS: meet-preprod.beta.numerique.gouv.fr - DJANGO_SUPERUSER_EMAIL: - secretKeyRef: - name: backend - key: DJANGO_SUPERUSER_EMAIL - DJANGO_SECRET_KEY: - secretKeyRef: - name: backend - key: DJANGO_SECRET_KEY - DJANGO_SETTINGS_MODULE: meet.settings - DJANGO_SILENCED_SYSTEM_CHECKS: security.W004, security.W008 - DJANGO_SUPERUSER_PASSWORD: - secretKeyRef: - name: backend - key: DJANGO_SUPERUSER_PASSWORD - DJANGO_EMAIL_HOST: "snap-mail.numerique.gouv.fr" - DJANGO_EMAIL_PORT: 465 - DJANGO_EMAIL_USE_SSL: True - OIDC_OP_JWKS_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/jwks - OIDC_OP_AUTHORIZATION_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/authorize - OIDC_OP_TOKEN_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/token - OIDC_OP_USER_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/userinfo - OIDC_OP_LOGOUT_ENDPOINT: https://fca.integ01.dev-agentconnect.fr/api/v2/session/end - OIDC_RP_CLIENT_ID: - secretKeyRef: - name: backend - key: OIDC_RP_CLIENT_ID - OIDC_RP_CLIENT_SECRET: - secretKeyRef: - name: backend - key: OIDC_RP_CLIENT_SECRET - OIDC_RP_SIGN_ALGO: RS256 - OIDC_RP_SCOPES: "openid email" - OIDC_REDIRECT_ALLOWED_HOSTS: https://meet-preprod.beta.numerique.gouv.fr - OIDC_AUTH_REQUEST_EXTRA_PARAMS: "{'acr_values': 'eidas1'}" - LOGIN_REDIRECT_URL: https://meet-preprod.beta.numerique.gouv.fr - LOGIN_REDIRECT_URL_FAILURE: https://meet-preprod.beta.numerique.gouv.fr - LOGOUT_REDIRECT_URL: https://meet-preprod.beta.numerique.gouv.fr - DB_HOST: - secretKeyRef: - name: postgresql.postgres.libre.sh - key: host - DB_NAME: - secretKeyRef: - name: postgresql.postgres.libre.sh - key: database - DB_USER: - secretKeyRef: - name: postgresql.postgres.libre.sh - key: username - DB_PASSWORD: - secretKeyRef: - name: postgresql.postgres.libre.sh - key: password - DB_PORT: - secretKeyRef: - name: postgresql.postgres.libre.sh - key: port - POSTGRES_USER: - secretKeyRef: - name: postgresql.postgres.libre.sh - key: username - POSTGRES_DB: - secretKeyRef: - name: postgresql.postgres.libre.sh - key: database - POSTGRES_PASSWORD: - secretKeyRef: - name: postgresql.postgres.libre.sh - key: password - REDIS_URL: - secretKeyRef: - name: redis.redis.libre.sh - key: url - STORAGES_STATICFILES_BACKEND: django.contrib.staticfiles.storage.StaticFilesStorage - LIVEKIT_API_SECRET: - secretKeyRef: - name: backend - key: LIVEKIT_API_SECRET - LIVEKIT_API_KEY: - secretKeyRef: - name: backend - key: LIVEKIT_API_KEY - LIVEKIT_API_URL: https://livekit-preprod.beta.numerique.gouv.fr - ALLOW_UNREGISTERED_ROOMS: False - - createsuperuser: - command: - - "/bin/sh" - - "-c" - - | - python manage.py createsuperuser --email $DJANGO_SUPERUSER_EMAIL --password $DJANGO_SUPERUSER_PASSWORD - restartPolicy: Never - -frontend: - image: - repository: lasuite/meet-frontend - pullPolicy: Always - tag: "v0.1.6" - -ingress: - enabled: true - host: meet-preprod.beta.numerique.gouv.fr - className: nginx - annotations: - cert-manager.io/cluster-issuer: letsencrypt-prod - -ingressAdmin: - enabled: true - host: meet-preprod.beta.numerique.gouv.fr - className: nginx - annotations: - cert-manager.io/cluster-issuer: letsencrypt-prod - nginx.ingress.kubernetes.io/auth-signin: https://oauth2-proxy-preprod.beta.numerique.gouv.fr/oauth2/start - nginx.ingress.kubernetes.io/auth-url: https://oauth2-proxy-preprod.beta.numerique.gouv.fr/oauth2/auth - -posthog: - ingress: - enabled: true - host: product.visio-preprod.beta.numerique.gouv.fr - annotations: - kubernetes.io/ingress.class: nginx - nginx.ingress.kubernetes.io/upstream-vhost: eu.i.posthog.com - nginx.ingress.kubernetes.io/backend-protocol: https diff --git a/src/helm/helmfile.yaml b/src/helm/helmfile.yaml index e6995b61..d6d08ca8 100644 --- a/src/helm/helmfile.yaml +++ b/src/helm/helmfile.yaml @@ -1,3 +1,28 @@ +environments: + dev: + values: + - version: 0.0.1 + secrets: + - env.d/{{ .Environment.Name }}/secrets.enc.yaml + staging: + values: + - version: 0.0.1 + addRedirect: True + enablePermanentRedirect: True + oldDomain: meet-staging.beta.numerique.gouv.fr + newDomain: visio-staging.beta.numerique.gouv.fr + secrets: + - env.d/{{ .Environment.Name }}/secrets.enc.yaml + production: + values: + - version: 0.0.1 + addRedirect: True + enablePermanentRedirect: True + oldDomain: meet.numerique.gouv.fr + newDomain: visio.numerique.gouv.fr + secrets: + - env.d/{{ .Environment.Name }}/secrets.enc.yaml + repositories: - name: bitnami url: registry-1.docker.io/bitnamicharts @@ -60,33 +85,3 @@ releases: - env.d/{{ .Environment.Name }}/values.livekit.yaml.gotmpl secrets: - env.d/{{ .Environment.Name }}/secrets.enc.yaml - -environments: - dev: - values: - - version: 0.0.1 - secrets: - - env.d/{{ .Environment.Name }}/secrets.enc.yaml - staging: - values: - - version: 0.0.1 - addRedirect: True - enablePermanentRedirect: True - oldDomain: meet-staging.beta.numerique.gouv.fr - newDomain: visio-staging.beta.numerique.gouv.fr - secrets: - - env.d/{{ .Environment.Name }}/secrets.enc.yaml - preprod: - values: - - version: 0.0.1 - secrets: - - env.d/{{ .Environment.Name }}/secrets.enc.yaml - production: - values: - - version: 0.0.1 - addRedirect: True - enablePermanentRedirect: True - oldDomain: meet.numerique.gouv.fr - newDomain: visio.numerique.gouv.fr - secrets: - - env.d/{{ .Environment.Name }}/secrets.enc.yaml