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
entur · Feb 4, 2025 · bfa896e · bfa896e
1 parent 63d75b7
commit bfa896e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -0,0 +1 @@
+gcp_resources_project = "ent-nanna-prd"