Merge branch 'main' into fang-ingen-gjeldende-ident

navikt · Sep 27, 2024 · 88a888e · 88a888e
2 parents 42509b1 + 9b65aaa
commit 88a888e
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 148 deletions.
diff --git a/.github/workflows/deploy-feature.yml b/.github/workflows/deploy-feature.yml
@@ -2,9 +2,6 @@ name: Deploy branch to dev
 run-name: Deploy feature branch ${{ github.ref_name }} by @${{ github.actor }}
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - gcp
 
 env:
   PRINT_PAYLOAD: true

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -3,7 +3,6 @@ on:
   push:
     branches:
       - main
-      - gcp-release
 
 env:
   PRINT_PAYLOAD: true

diff --git a/nais-dev-gcp.yaml b/nais-dev-gcp.yaml
@@ -65,14 +65,10 @@ spec:
       value: api://dev-gcp.amt.amt-tiltak/.default
     - name: KAFKA_ENABLED
       value: "true"
-    - name: VEILARBOPPFOLGING_FSS_URL
-      value: "https://veilarboppfolging.dev-fss-pub.nais.io"
     - name: VEILARBARENA_URL
       value: "https://veilarbarena.dev-fss-pub.nais.io"
     - name: VEILARBARENA_AZURE_SCOPE
       value: "api://dev-fss.pto.veilarbarena/.default"
-    - name: FSS_PROXY_ENABLED
-      value: "false"
     - name: NORG2_URL
       value: "http://norg2.org/norg2"
     - name: PDL_URL
@@ -107,7 +103,6 @@ spec:
         - application: norg2
           namespace: org
       external:
-        - host: veilarboppfolging.dev-fss-pub.nais.io
         - host: veilarbarena.dev-fss-pub.nais.io
         - host: norg2.dev-fss-pub.nais.io
         - host: pdl-api.dev-fss-pub.nais.io
@@ -166,9 +161,6 @@ spec:
         - application: veilarbdirigent
           namespace: pto
           cluster: dev-fss
-        - application: veilarbdialog
-          namespace: pto
-          cluster: dev-fss
         - application: veilarbdialog
           namespace: dab
           cluster: dev-gcp
@@ -187,9 +179,6 @@ spec:
         - application: start-samtale
           namespace: pto
           cluster: dev-gcp
-        - application: esyfo-info-frontend
-          namespace: team-esyfo
-          cluster: dev-gcp
         - application: amt-person-service
           namespace: amt
           cluster: dev-gcp

diff --git a/nais-prod-gcp.yaml b/nais-prod-gcp.yaml
@@ -15,7 +15,7 @@ spec:
     sqlInstances:
       - name: veilarboppfolging
         type: POSTGRES_14
-        tier: db-custom-8-53248 #TODO reduser etter migrering?
+        tier: db-custom-2-7680
         diskType: SSD
         diskAutoresize: true
         highAvailability: true
@@ -68,14 +68,10 @@ spec:
       value: api://prod-gcp.amt.amt-tiltak/.default
     - name: KAFKA_ENABLED
       value: "true"
-    - name: VEILARBOPPFOLGING_FSS_URL
-      value: "https://veilarboppfolging.prod-fss-pub.nais.io"
     - name: VEILARBARENA_URL
       value: "https://veilarbarena.prod-fss-pub.nais.io"
     - name: VEILARBARENA_AZURE_SCOPE
       value: "api://prod-fss.pto.veilarbarena/.default"
-    - name: FSS_PROXY_ENABLED
-      value: "false"
     - name: NORG2_URL
       value: "http://norg2.org/norg2"
     - name: PDL_URL
@@ -111,7 +107,6 @@ spec:
         - application: norg2
           namespace: org
       external:
-        - host: veilarboppfolging.prod-fss-pub.nais.io
         - host: veilarbarena.prod-fss-pub.nais.io
         - host: norg2.prod-fss-pub.nais.io
         - host: pdl-api.prod-fss-pub.nais.io
@@ -167,9 +162,6 @@ spec:
         - application: veilarbdirigent
           namespace: pto
           cluster: prod-fss
-        - application: veilarbdialog
-          namespace: pto
-          cluster: prod-fss
         - application: veilarbdialog
           namespace: dab
           cluster: prod-gcp
@@ -188,9 +180,6 @@ spec:
         - application: start-samtale
           namespace: pto
           cluster: prod-gcp
-        - application: esyfo-info-frontend
-          namespace: team-esyfo
-          cluster: prod-gcp
         - application: amt-person-service
           namespace: amt
           cluster: prod-gcp

diff --git a/pom.xml b/pom.xml
@@ -227,11 +227,6 @@
             <artifactId>kafka</artifactId>
             <version>${common.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-gateway-mvc</artifactId>
-            <version>4.1.4</version>
-        </dependency>
 
         <!-- test -->
         <dependency>

diff --git a/src/main/kotlin/no/nav/veilarboppfolging/proxy/ProxyToOnPremFilter.kt b/src/main/kotlin/no/nav/veilarboppfolging/proxy/ProxyToOnPremFilter.kt
diff --git a/src/main/kotlin/no/nav/veilarboppfolging/proxy/ProxyToOnPremTokenProvider.kt b/src/main/kotlin/no/nav/veilarboppfolging/proxy/ProxyToOnPremTokenProvider.kt
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
@@ -19,8 +19,6 @@ spring.flyway.enabled=false
 # Vi setter opp kobling til database manuelt
 spring.data.jdbc.repositories.enabled=false
 
-spring.cloud.gateway.mvc.enabled=${FSS_PROXY_ENABLED:true}
-
 # Application environment
 # From config map "pto-config"
 app.env.norg2Url=${NORG2_URL:null}
@@ -71,6 +69,4 @@ app.datasource.password=${DB_PASSWORD:null}
 # swagger-ui custom path
 springdoc.swagger-ui.path=/internal/swagger-ui.html
 springdoc.pathsToMatch=/api/**
-app.kafka.enabled=${KAFKA_ENABLED:false}
-veilarboppfolging-fss:
-    url: ${VEILARBOPPFOLGING_FSS_URL}
+app.kafka.enabled=${KAFKA_ENABLED:false}
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ on: @@
       push:
         branches:
           - main
-          - gcp-release
     env:
       PRINT_PAYLOAD: true
@@ Expand Down @@