Merge branch 'master' into feature/dolly-frontend-react-hook-form-mig…

…ration
navikt · Jan 18, 2024 · 774e56b · 774e56b
2 parents 312e5d2 + b930217
commit 774e56b
Show file tree

Hide file tree

Showing 19 changed files with 12 additions and 30 deletions.
diff --git a/apps/batch-bestilling-service/config.yml b/apps/batch-bestilling-service/config.yml
@@ -11,8 +11,6 @@ spec:
   webproxy: true
   tokenx:
     enabled: true
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:

diff --git a/apps/dolly-backend/config.test.yml b/apps/dolly-backend/config.test.yml
@@ -110,4 +110,4 @@ spec:
         name: testnav-dolly-backend-dev
         databases:
           - name: testnav-dolly-backend-dev
-        autoBackupTime: "01:00"
+        autoBackupHour: 3
diff --git a/apps/dolly-backend/config.yml b/apps/dolly-backend/config.yml
@@ -118,4 +118,4 @@ spec:
         databases:
           - name: testnav-dolly-backend
         tier: db-custom-2-3840
-        autoBackupTime: "01:00"
+        autoBackupHour: 2
diff --git a/apps/dolly-frontend/config.test.yml b/apps/dolly-frontend/config.test.yml
@@ -17,6 +17,7 @@ spec:
       autoLogin: true
       autoLoginIgnorePaths:
         - /login
+        - /assets/*
     application:
       allowAllUsers: true
       enabled: true

diff --git a/apps/dolly-frontend/config.unstable.yml b/apps/dolly-frontend/config.unstable.yml
@@ -17,7 +17,7 @@ spec:
       autoLogin: true
       autoLoginIgnorePaths:
         - /login
-      errorPath: /login
+        - /assets/*
     application:
       allowAllUsers: true
       enabled: true

diff --git a/apps/dolly-frontend/config.yml b/apps/dolly-frontend/config.yml
@@ -17,6 +17,7 @@ spec:
       autoLogin: true
       autoLoginIgnorePaths:
         - /login
+        - /assets/*
     application:
       allowAllUsers: true
       enabled: true

diff --git a/apps/generer-navn-service/config.yml b/apps/generer-navn-service/config.yml
@@ -8,8 +8,6 @@ metadata:
 spec:
   image: "{{image}}"
   port: 8080
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:

diff --git a/apps/generer-synt-amelding-service/config.yml b/apps/generer-synt-amelding-service/config.yml
@@ -9,8 +9,6 @@ spec:
   image: "{{image}}"
   port: 8080
   webproxy: true
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:

diff --git a/apps/geografiske-kodeverk-service/config.yml b/apps/geografiske-kodeverk-service/config.yml
@@ -8,8 +8,6 @@ metadata:
 spec:
   image: "{{image}}"
   port: 8080
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:

diff --git a/apps/joark-dokument-service/config.yml b/apps/joark-dokument-service/config.yml
@@ -8,8 +8,6 @@ metadata:
 spec:
   image: "{{image}}"
   port: 8080
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:

diff --git a/apps/miljoer-service/config.yml b/apps/miljoer-service/config.yml
@@ -9,8 +9,6 @@ spec:
   image: "{{image}}"
   port: 8080
   webproxy: true
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:

diff --git a/apps/organisasjon-tilgang-service/config.yml b/apps/organisasjon-tilgang-service/config.yml
@@ -77,4 +77,4 @@ spec:
         name: testnav-organisasjon-tilganger
         databases:
           - name: testnav-organisasjon-tilganger
-        autoBackupTime: "02:30"
+        autoBackupHour: 2
diff --git a/apps/orgnummer-service/config.yml b/apps/orgnummer-service/config.yml
@@ -65,4 +65,4 @@ spec:
         name: testnav-orgnummer-pool
         databases:
           - name: testnav-orgnummer-pool
-        autoBackupTime: "02:00"
+        autoBackupHour: 2
diff --git a/apps/profil-api/config.test.yml b/apps/profil-api/config.test.yml
@@ -20,8 +20,6 @@ spec:
       enabled: true
       tenant: nav.no
   port: 8080
-  tracing:
-    enabled: true
   envFrom:
     - secret: user-encryption-dev
   accessPolicy:

diff --git a/apps/profil-api/config.yml b/apps/profil-api/config.yml
@@ -20,8 +20,6 @@ spec:
       enabled: true
       tenant: nav.no
   port: 8080
-  tracing:
-    enabled: true
   envFrom:
     - secret: user-encryption-prod
   accessPolicy:

diff --git a/apps/testnav-ident-pool/config.yml b/apps/testnav-ident-pool/config.yml
@@ -72,4 +72,4 @@ spec:
         databases:
           - name: testnav-identpool
         tier: db-custom-1-3840
-        autoBackupTime: "02:00"
+        autoBackupHour: 2
diff --git a/apps/tilbakemelding-api/config.yml b/apps/tilbakemelding-api/config.yml
@@ -8,8 +8,6 @@ metadata:
 spec:
   image: "{{image}}"
   port: 8080
-  tracing:
-    enabled: true
   accessPolicy:
     inbound:
       rules:

diff --git a/apps/tps-messaging-service/config.yml b/apps/tps-messaging-service/config.yml
@@ -82,11 +82,7 @@ spec:
       external:
         - host: b27apvl221.preprod.local
           ports:
-            - name: MQ Q-env
-              port: 1413
-              protocol: TCP
+            - port: 1413
         - host: d26apvl300.test.local
           ports:
-            - name: MQ T-env
-              port: 1412
-              protocol: TCP
+            - port: 1412
diff --git a/...service/src/test/java/no/nav/testnav/apps/tpsmessagingservice/ApplicationContextTest.java b/...service/src/test/java/no/nav/testnav/apps/tpsmessagingservice/ApplicationContextTest.java
@@ -1,5 +1,6 @@
 package no.nav.testnav.apps.tpsmessagingservice;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -9,6 +10,7 @@
 
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 
+@Disabled
 @SpringBootTest
 @ActiveProfiles("test")
 class ApplicationContextTest {