From bfa896e0f4aa0fe7cfcfb5a7ff2f1b767dbe40dc Mon Sep 17 00:00:00 2001 From: erlendev Date: Tue, 4 Feb 2025 09:04:58 +0100 Subject: [PATCH] Adds config values for tf and helm in production * This commit also removes some unused variables from the existing helm variable files used for test and dev --- helm/nanna/env/values-kub-ent-dev.yaml | 5 ----- helm/nanna/env/values-kub-ent-prd.yaml | 23 +++++++++++++++++++++++ helm/nanna/env/values-kub-ent-tst.yaml | 1 - terraform/env/kub-ent-prd.tfvars | 1 + 4 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 helm/nanna/env/values-kub-ent-prd.yaml create mode 100644 terraform/env/kub-ent-prd.tfvars diff --git a/helm/nanna/env/values-kub-ent-dev.yaml b/helm/nanna/env/values-kub-ent-dev.yaml index 2749f1e..6b66788 100644 --- a/helm/nanna/env/values-kub-ent-dev.yaml +++ b/helm/nanna/env/values-kub-ent-dev.yaml @@ -19,10 +19,5 @@ auth0: url: https://internal.dev.entur.org/ partner: url: https://partner.dev.entur.org/ - domain: ror-entur-dev.eu.auth0.com -# admin: -# client: -# id: dXrBh0VYvPEbz3tCTQzSudyde5hK93mL -# domain: ror-entur-dev.eu.auth0.com monitoringEnabled: true diff --git a/helm/nanna/env/values-kub-ent-prd.yaml b/helm/nanna/env/values-kub-ent-prd.yaml new file mode 100644 index 0000000..0cf5269 --- /dev/null +++ b/helm/nanna/env/values-kub-ent-prd.yaml @@ -0,0 +1,23 @@ +replicas: 2 +gcp: + databaseInstance: ent-nanna-prd:europe-west1:nanna-db-pg13 + +chouette: + service: http://chouette.prd.entur.internal + +ingress: + domain: .entur.io + providers: + name: timetable-admin-v1-providers + +auth0: + ror: + url: https://auth2.entur.org/ + audience: https://ror.api.entur.io + entur: + internal: + url: https://internal.entur.org/ + partner: + url: https://partner.entur.org/ + +monitoringEnabled: true diff --git a/helm/nanna/env/values-kub-ent-tst.yaml b/helm/nanna/env/values-kub-ent-tst.yaml index 44b677c..4d5bdc9 100644 --- a/helm/nanna/env/values-kub-ent-tst.yaml +++ b/helm/nanna/env/values-kub-ent-tst.yaml @@ -19,6 +19,5 @@ auth0: url: https://internal.staging.entur.org/ partner: url: https://partner.staging.entur.org/ - domain: ror-entur-staging.eu.auth0.com monitoringEnabled: true diff --git a/terraform/env/kub-ent-prd.tfvars b/terraform/env/kub-ent-prd.tfvars new file mode 100644 index 0000000..9e88a52 --- /dev/null +++ b/terraform/env/kub-ent-prd.tfvars @@ -0,0 +1 @@ +gcp_resources_project = "ent-nanna-prd"