Merge pull request #101 from navikt/dev

[KAIZEN-0] fjern fss

Author: abrhanav

.github/workflows/main.yml

@@ -57,24 +57,7 @@ jobs:
             identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
             project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
 
-  deploy-qa:
-    name: Deploy to preprod
-    needs: build-and-push
-    if: github.ref == 'refs/heads/dev'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-    steps:
-      - uses: actions/checkout@v4
-      - uses: nais/deploy/actions/deploy@v2
-        env:
-          PRINT_PAYLOAD: true
-          CLUSTER: dev-fss
-          RESOURCE: .nais/preprod.yml
-          VAR: image=${{ needs.build-and-push.outputs.image }}
-
-  deploy-dev-gcp:
+  deploy-dev:
     name: Deploy to dev-gcp
     needs: build-and-push
     if: github.ref == 'refs/heads/dev'
@@ -92,23 +75,6 @@ jobs:
           VAR: image=${{ needs.build-and-push.outputs.image }}
 
   deploy-prod:
-    name: Deploy to prod
-    needs: build-and-push
-    if: github.ref == 'refs/heads/master'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      id-token: write
-    steps:
-      - uses: actions/checkout@v4
-      - uses: nais/deploy/actions/deploy@v2
-        env:
-          PRINT_PAYLOAD: true
-          CLUSTER: prod-fss
-          RESOURCE: .nais/prod.yml
-          VAR: image=${{ needs.build-and-push.outputs.image }}
-
-  deploy-prod-gcp:
     name: Deploy to prod gcp
     needs: build-and-push
     if: github.ref == 'refs/heads/master'
@@ -122,5 +88,5 @@ jobs:
         env:
           PRINT_PAYLOAD: true
           CLUSTER: prod-gcp
-          RESOURCE: .nais/prod-gcp.yml
+          RESOURCE: .nais/prod.yml
           VAR: image=${{ needs.build-and-push.outputs.image }}

.nais/preprod.yml

@@ -8,7 +8,6 @@ metadata:
 spec:
   image: {{image}}
   port: 7070
-  webproxy: true
   liveness:
     path: /internal/isAlive
     initialDelay: 20
@@ -45,53 +44,64 @@ spec:
       claims:
         extra:
           - "NAVident"
-  vault:
-    enabled: true
-    paths:
-      - kvPath: /serviceuser/data/prod/srvmodiarobotapi
-        mountPath: /var/run/secrets/nais.io/srvmodiarobotapi
-      - kvPath: /serviceuser/data/prod/srvmodiabrukerdialog
-        mountPath: /var/run/secrets/nais.io/service_user
-      - kvPath: /serviceuser/data/prod/srvssolinux
-        mountPath: /var/run/secrets/nais.io/srvssolinux
-      - kvPath: /apikey/appdynamics/dev
-        mountPath: /var/run/secrets/nais.io/vault
+  accessPolicy:
+    outbound:
+      external:
+        - host: veilarboppfolging.prod-fss-pub.nais.io
+        - host: nom-api.intern.prod.nav.no
+        - host: pdl-api.prod-fss-pub.nais.io
+        - host: saf.prod-fss-pub.nais.io
+        - host: digdir-krr-proxy.intern.nav.no
+        - host: sokos-utbetaldata.prod-fss-pub.nais.io
+        - host: sf-henvendelse-api-proxy.prod-fss-pub.nais.io
+        - host: sokos-kontoregister-person.intern.nav.no
+    inbound:
+      rules:
+        - application: rpa-medlemskap-og-avgift
+          namespace: team-rpa
+          cluster: prod-fss
+        - application: ida
+          cluster: prod-fss
+          namespace: traktor
+        - application: rpa-nav-okonomi-stonad
+          cluster: prod-fss
+          namespace: team-rpa-nos
   env:
     - name: IDENT_ALLOW_LIST
       value: "R154727,R156418,R158345,R158346,R160569,R165950,R165951,R165952,R150818,R150819,R155645,R162552,D159483,U143410"
     - name: OPPFOLGING_URL
-      value: "https://veilarboppfolging.intern.nav.no/veilarboppfolging/api"
+      value: "https://veilarboppfolging.prod-fss-pub.nais.io/veilarboppfolging/api"
     - name: OPPFOLGING_SCOPE
       value: "prod-fss:pto:veilarboppfolging"
     - name: NOM_URL
       value: "https://nom-api.intern.nav.no"
     - name: NOM_SCOPE
       value: "prod-gcp:nom:nom-api"
     - name: PDL_URL
-      value: "https://pdl-api.nais.adeo.no/graphql"
+      value: "https://pdl-api.prod-fss-pub.nais.io/graphql"
     - name: PDL_SCOPE
       value: "prod-fss:pdl:pdl-api"
     - name: SAF_URL
-      value: "https://saf.nais.adeo.no/graphql"
+      value: "https://saf.prod-fss-pub.nais.io/graphql"
     - name: SAF_SCOPE
       value: "prod-fss:teamdokumenthandtering:saf"
     - name: SKRIVESTOTTE_URL
       value: "https://modiapersonoversikt-skrivestotte.intern.nav.no"
     - name: DIGDIR_KRR_URL
-      value: "https://digdir-krr-proxy.intern.nav.no"
+      value: "https://digdir-krr-proxy.intern.nav.no/"
     - name: DIGDIR_KRR_SCOPE
       value: "prod-gcp:team-rocket:digdir-krr-proxy"
     - name: UTBETALDATA_SOKOS_URL
-      value: "https://sokos-utbetaldata.intern.nav.no/utbetaldata/api"
+      value: "https://sokos-utbetaldata.prod-fss-pub.nais.io/utbetaldata/api"
     - name: UTBETAL_SOKOS_SCOPE
       value: "prod-fss:okonomi:sokos-utbetaldata"
     - name: SF_HENVENDELSE_URL
-      value: "https://sf-henvendelse.intern.nav.no/api"
+      value: "https://sf-henvendelse-api-proxy.prod-fss-pub.nais.io/api"
     - name: SF_HENVENDELSE_SCOPE
-      value: "prod-fss:teamcrm:sf-henvendelse"
+      value: "prod-fss:teamnks:sf-henvendelse-api-proxy"
     - name: KONTOREGISTER_REST_URL
       value: "https://sokos-kontoregister-person.intern.nav.no/api/system"
     - name: KONTOREGISTER_SCOPE
       value: "prod-gcp:okonomi:sokos-kontoregister-person"
     - name: CXF_SECURE_LOG
-      value: "enabled"
+      value: "enabled"