Update Maskinporten Guardian deploy config

statisticsnorway · Oct 28, 2024 · 3f26f9b · 3f26f9b
1 parent 79d68ce
commit 3f26f9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/.nais/prod.yaml b/.nais/prod.yaml
@@ -39,13 +39,15 @@ spec:
 
   env:
     - name: MICRONAUT_CONFIG_FILES
-      value: /conf/bootstrap-prod.yml,/conf/application-prod.yml,/conf/auth/maskinporten-clients.yml
+      value: /conf/bootstrap-prod.yml,/conf/application-prod.yml,/conf/protected/application-gcp.yml,/conf/auth/maskinporten-clients.yml
     - name: LOGBACK_CONFIGURATION_FILE
       value: /conf/logback-prod.xml
 
   filesFrom:
     - configmap: guardian-application-prod-configmap
       mountPath:  /conf
+    - configmap: guardian-application-prod-protected-configmap
+      mountPath:  /conf/protected
     - configmap: maskinporten-clients-prod-configmap
       mountPath:  /conf/auth
 
@@ -54,7 +56,7 @@ spec:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: maskinporten-guardian-application-yaml-configmap
+  name: guardian-application-prod-configmap
   namespace: dapla-stat
   labels:
     team: dapla-stat
@@ -89,9 +91,6 @@ data:
       prometheus:
         sensitive: false
     
-    gcp:
-      project-id: ssb-team-dapla
-    
     services:
       secrets:
         impl: GCP

diff --git a/.nais/test.yaml b/.nais/test.yaml
@@ -39,13 +39,15 @@ spec:
 
   env:
     - name: MICRONAUT_CONFIG_FILES
-      value: /conf/bootstrap-test.yml,/conf/application-test.yml,/conf/auth/maskinporten-clients.yml
+      value: /conf/bootstrap-test.yml,/conf/application-test.yml,/conf/protected/application-gcp.yml,/conf/auth/maskinporten-clients.yml
     - name: LOGBACK_CONFIGURATION_FILE
-      value: /conf/logback-test.xml
+      value: /conf/logback-prod.xml
 
   filesFrom:
     - configmap: guardian-application-test-configmap
       mountPath:  /conf
+    - configmap: guardian-application-test-protected-configmap
+      mountPath:  /conf/protected
     - configmap: maskinporten-clients-test-configmap
       mountPath:  /conf/auth
 
@@ -104,10 +106,7 @@ data:
     endpoints:
       prometheus:
         sensitive: false
-    
-    gcp:
-      project-id: ssb-team-dapla-staging
-    
+
     services:
       secrets:
         impl: GCP