From e66a21144582e47d2cc622d0e5d66cb016a9cfa5 Mon Sep 17 00:00:00 2001 From: Fabio Bonelli Date: Wed, 16 Nov 2022 12:03:23 +0100 Subject: [PATCH] feat(onboarding): add staging configuration Add the DEVELOPERS_ITALIA_API_URL env variable to point to the staging API in the staging deployment. Also get a different secret in staging based on the name of the deployment. --- onboarding/templates/deployment.yaml | 2 ++ onboarding/templates/secretproviderclass.yaml | 8 ++++---- onboarding/values-staging.yaml | 1 + onboarding/values.yaml | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/onboarding/templates/deployment.yaml b/onboarding/templates/deployment.yaml index 184d6e8..c26e72f 100644 --- a/onboarding/templates/deployment.yaml +++ b/onboarding/templates/deployment.yaml @@ -83,6 +83,8 @@ spec: value: "{{ .Values.onboarding.env.onboarding_email_override_recipient_addr }}" - name: ONBOARDING_EMAIL_SUBJECT value: "{{ .Values.onboarding.env.onboarding_email_subject }}" + - name: DEVELOPERS_ITALIA_API_URL + value: "{{ .Values.onboarding.env.developers_italia_api_url }}" - name: ONBOARDING_SMTP_HOSTNAME value: "{{ .Values.onboarding.env.onboarding_smtp_hostname }}" - name: ONBOARDING_SMTP_USERNAME diff --git a/onboarding/templates/secretproviderclass.yaml b/onboarding/templates/secretproviderclass.yaml index b946026..62620e7 100644 --- a/onboarding/templates/secretproviderclass.yaml +++ b/onboarding/templates/secretproviderclass.yaml @@ -11,17 +11,17 @@ spec: objects: | array: - | - objectName: k8s-secrets-onboarding-smtp-password + objectName: k8s-secrets-{{ template "onboarding.fullname" . }}-smtp-password objectType: secret - | - objectName: k8s-secrets-paseto-key + objectName: k8s-secrets-{{ template "onboarding.fullname" . }}-paseto-key objectType: secret tenantId: f7f7d6c7-92de-488e-b37e-8963207c7b86 secretObjects: - data: - key: smtp-password - objectName: k8s-secrets-onboarding-smtp-password + objectName: k8s-secrets-{{ template "onboarding.fullname" . }}-smtp-password - key: paseto-key - objectName: k8s-secrets-paseto-key + objectName: k8s-secrets-{{ template "onboarding.fullname" . }}-paseto-key secretName: {{ template "onboarding.fullname" . }}-azure-kv type: Opaque diff --git a/onboarding/values-staging.yaml b/onboarding/values-staging.yaml index 31ef4fc..2b68435 100644 --- a/onboarding/values-staging.yaml +++ b/onboarding/values-staging.yaml @@ -26,6 +26,7 @@ onboarding: onboarding_email_subject: "[staging] Onboarding Developers Italia" onboarding_smtp_hostname: smtp.eu.mailgun.org onboarding_smtp_username: onboarding@developers.italia.it + developers_italia_api_url: "https://api-staging.developers.italia.it/v1" services: httpPort: diff --git a/onboarding/values.yaml b/onboarding/values.yaml index 7fe02b0..ee6a8d6 100644 --- a/onboarding/values.yaml +++ b/onboarding/values.yaml @@ -24,6 +24,7 @@ onboarding: onboarding_email_subject: "Onboarding Developers Italia" onboarding_smtp_hostname: smtp.eu.mailgun.org onboarding_smtp_username: onboarding@developers.italia.it + developers_italia_api_url: "https://api.developers.italia.it/v1" services: httpPort: