Revert "[PROD][KAIZEN-0] flyttet modiapersonoversikt-api til gcp "

.github/workflows/proxy.yaml → .github/workflows/main.yml

@@ -1,9 +1,9 @@
-name: modiapersonoversikt-api-proxy build, push, and deploy
+name: Build, push, and deploy
 
 on: [push]
 
 concurrency:
-  group: proxy-${{ github.ref }}
+  group: main-${{ github.ref }}
   cancel-in-progress: true
 
 env:
@@ -41,17 +41,23 @@ jobs:
           mvn -P ci -B package --settings .github/maven-settings.xml -DskipTests
       - name: Publish Dev Image
         if: github.ref == 'refs/heads/dev' || github.ref == 'refs/heads/master'
-
         uses: nais/docker-build-push@v0
         id: docker-build-push
         with:
           team: personoversikt
-          image_suffix: proxy
-          dockerfile: proxy/Dockerfile
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
 
-  deploy-dev:
+      - name: Deploy to Q1 (Test branch)
+        uses: nais/deploy/actions/deploy@v2
+        if: github.ref == env.Q1_TEST_BRANCH
+        env:
+          PRINT_PAYLOAD: true
+          CLUSTER: dev-fss
+          RESOURCE: .nais/nais-q1.yml
+          VAR: version=${{ github.sha }},image=${{ steps.docker-build-push.outputs.image }}
+
+  deploy-qa:
     name: Deploy to preprod
     needs: build
     if: github.ref == 'refs/heads/dev'
@@ -68,7 +74,7 @@ jobs:
         env:
           PRINT_PAYLOAD: true
           CLUSTER: dev-fss
-          RESOURCE: proxy/.nais/nais-${{ matrix.namespace }}.yml
+          RESOURCE: .nais/nais-${{ matrix.namespace }}.yml
           VAR: version=${{ github.sha }},image=${{ needs.build.outputs.image }}
 
   deploy-prod:
@@ -85,5 +91,5 @@ jobs:
         env:
           PRINT_PAYLOAD: true
           CLUSTER: prod-fss
-          RESOURCE: proxy/.nais/prod.yml
-          VAR: version=${{ github.sha }},image=${{ needs.build.outputs.image }}
+          RESOURCE: .nais/nais.yml
+          VAR: version=${{ github.sha }},image=${{ needs.build.outputs.image }}

.github/workflows/topic.yml

@@ -0,0 +1,40 @@
+name: "Deploy henvendelse oppdatering topic"
+on:
+  push:
+    paths:
+      - .nais/topics/**
+      - .github/workflows/topic.yml
+jobs:
+  deploy-topic-to-dev:
+    if: github.ref == 'refs/heads/dev'
+    name: Deploy topic to dev-fss
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Deploy henvendelse-oppdatering-melding topic
+        uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: dev-gcp
+          RESOURCE: .nais/topics/henvendelse-oppdatering-melding.yml
+          VARS: .nais/topics/dev.json
+
+  deploy-topic-to-prod:
+    if: github.ref == 'refs/heads/master'
+    name: Deploy topic to prod-fss
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Deploy henvendelse-oppdatering-melding topic
+        uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: prod-gcp
+          RESOURCE: .nais/topics/henvendelse-oppdatering-melding.yml
+          VARS: .nais/topics/prod.json

.github/workflows/unleash.yml

@@ -18,8 +18,8 @@ jobs:
       - name: Deploy unleash api token
         uses: nais/deploy/actions/deploy@v2
         env:
-          CLUSTER: dev-gcp
-          RESOURCE: web/.nais/unleash/unleash-apitoken-preprod.yaml
+          CLUSTER: dev-fss
+          RESOURCE: .nais/unleash/unleash-apitoken-preprod.yaml
 
   deploy-unleash-api-token-to-prod:
     if: github.ref == 'refs/heads/master'
@@ -34,5 +34,5 @@ jobs:
       - name: Deploy unleash api token
         uses: nais/deploy/actions/deploy@v2
         env:
-          CLUSTER: prod-gcp
-          RESOURCE: web/.nais/unleash/unleash-apitoken-prod.yaml
+          CLUSTER: prod-fss
+          RESOURCE: .nais/unleash/unleash-apitoken-prod.yaml

web/.nais/nais-q0.yml → .nais/nais-q0.yml

@@ -66,6 +66,8 @@ spec:
       claims:
         extra:
           - "NAVident"
+  kafka:
+    pool: nav-dev
   accessPolicy:
     outbound:
       external:
@@ -79,12 +81,28 @@ spec:
   env:
     - name: APP_ENVIRONMENT_NAME
       value: "q0"
-    - name: MS_GRAPH_URL
-      value: "https://graph.microsoft.com/"
-    - name: MS_GRAPH_SCOPE
-      value: "https://graph.microsoft.com/.default"
+    - name: APP_VERSION
+      value: "{{ version }}"
+    - name: ONPREM_CLUSTER_NAME
+      value: "dev-fss"
+    - name: GCP_CLUSTER
+      value: "dev-gcp"
+    - name: SECURITY_TOKEN_SERVICE_DISCOVERY_URL
+      value: "https://security-token-service.nais.preprod.local/rest/v1/sts/.well-known/openid-configuration"
+    - name: SECURITYTOKENSERVICE_URL
+      value: "https://security-token-service.nais.preprod.local/rest/v1/sts/ws/samltoken"
     - name: FELLES_KODEVERK_URL
       value: "https://kodeverk-api.nav.no"
+    - name: LDAP_BASEDN
+      value: "dc=preprod,dc=local"
+    - name: LDAP_DOMAIN
+      value: "PREPROD.LOCAL"
+    - name: LDAP_SERVICEUSER_BASEDN
+      value: "ou=ServiceAccounts,dc=preprod,dc=local"
+    - name: LDAP_URL
+      value: "ldaps://ldapgw.preprod.local"
+    - name: LDAP_USER_BASEDN
+      value: "ou=NAV,ou=BusinessUnits,dc=preprod,dc=local"
     - name: SAF_GRAPHQL_URL
       value: "https://saf-q0.nais.preprod.local/graphql"
     - name: SAF_HENTDOKUMENT_URL
@@ -107,10 +125,22 @@ spec:
       value: "https://digdir-krr-proxy.intern.dev.nav.no/"
     - name: KRR_SCOPE
       value: "dev-gcp:team-rocket:digdir-krr-proxy"
+    - name: VIRKSOMHET_FORELDREPENGER_V2_ENDPOINTURL
+      value: "https://modapp-q0.adeo.no/infotrygd-ws/ForeldrepengerService/v2"
+    - name: VIRKSOMHET_OPPFOLGING_V1_ENDPOINTURL
+      value: "https://arena-q0.adeo.no/ail_ws/Oppfoelging_v1"
+    - name: EREG_ENDPOINTURL
+      value: "https://ereg-services-q0.intern.dev.nav.no/"
     - name: KONTOREGISTER_REST_URL
       value: "https://sokos-kontoregister-person.intern.dev.nav.no/api/system"
     - name: KONTOREGISTER_SCOPE
       value: "dev-gcp:okonomi:sokos-kontoregister-person"
+    - name: VIRKSOMHET_PLEIEPENGER_V1_ENDPOINTURL
+      value: "https://modapp-q0.adeo.no/infotrygd-ws/Pleiepenger/v1"
+    - name: VIRKSOMHET_SYKEPENGER_V2_ENDPOINTURL
+      value: "https://modapp-q0.adeo.no/infotrygd-ws/SykepengerService/v2"
+    - name: VIRKSOMHET_YTELSESKONTRAKT_V3_ENDPOINTURL
+      value: "https://arena-q0.adeo.no/ail_ws/Ytelseskontrakt_v3"
     - name: SF_HENVENDELSE_URL
       value: "https://sf-henvendelse-api-proxy.dev.intern.nav.no/api"
     - name: SF_HENVENDELSE_SCOPE
@@ -126,11 +156,11 @@ spec:
     - name: PERSONFORVALTER_URL
       value: "https://pdl-web.dev.intern.nav.no/endreperson"
     - name: OPPGAVE_BASEURL
-      value: "https://oppgave-q0.dev.intern.nav.no"
+      value: "https://oppgave-q0.nais.preprod.local/"
     - name: OPPGAVE_SCOPE
-      value: "dev-fss:oppgavehandtering:oppgave-q0"
+      value: "dev-fss:oppgavehandtering:oppgave"
     - name: NORG2_BASEURL
-      value: "https://norg2.intern.dev.nav.no"
+      value: "https://app-q0.adeo.no/norg2"
     - name: SAKSOVERSIKT_PRODSETTNINGSDATO
       value: "2016-06-04"
     - name: INTERNAL_TILGANG
@@ -149,18 +179,18 @@ spec:
       value: "https://skjermede-personer-pip.intern.dev.nav.no"
     - name: SKJERMEDE_PERSONER_SCOPE
       value: "dev-gcp:nom:skjermede-personer-pip"
+    - name: ARENA_SAK_VEDTAK_URL
+      value: "https://arena-q0.adeo.no/arena_ws/services/ArenaSakVedtakService"
     - name: TMS_EVENT_API_URL
       value: "https://tms-event-api.ekstern.dev.nav.no/tms-event-api"
     - name: TMS_EVENT_API_SCOPE
       value: "dev-gcp:min-side:tms-event-api"
+    - name: KAFKA_HENVENDELSE_OPPDATERING_TOPIC
+      value: "personoversikt.henvendelse-oppdatering-melding"
     - name: MODIA_SOKNADSSTATUS_API_URL
       value: "https://modia-soknadsstatus-api.intern.dev.nav.no"
     - name: MODIA_SOKNADSSTATUS_SCOPE
       value: "dev-gcp:personoversikt:modia-soknadsstatus-api"
-    - name: MODIAPERSONOVERSIKT_API_PROXY_URL
-      value: "https://modiapersonoversikt-api-proxy-q0.intern.dev.nav.no"
-    - name: MODIAPERSONOVERSIKT_API_PROXY_SCOPE
-      value: "dev-fss:personoversikt:modiapersonoversikt-api-proxy-q0"
     - name: UNLEASH_ENVIRONMENT
       value: "development"
     - name: SKATTEETATEN_INNKREVINGSOPPDRAG_API_BASE_URL