From 7396be80943db27ae591f55613d37217e5544d76 Mon Sep 17 00:00:00 2001
From: Thomas Johansen <thomas.johansen3@nav.no>
Date: Tue, 3 Dec 2024 11:27:11 +0100
Subject: [PATCH] Deploy bekreftelse-api til prod

---
 .github/workflows/bekreftelse-api.yaml       | 40 ++++++++++----------
 apps/bekreftelse-api/nais/nais-prod.yaml     |  4 +-
 apps/kafka-key-generator/nais/nais-dev.yaml  |  8 ++--
 apps/kafka-key-generator/nais/nais-prod.yaml |  9 +++--
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/bekreftelse-api.yaml b/.github/workflows/bekreftelse-api.yaml
index f2a78c8c..c5c62e34 100644
--- a/.github/workflows/bekreftelse-api.yaml
+++ b/.github/workflows/bekreftelse-api.yaml
@@ -81,23 +81,23 @@ jobs:
           RESOURCE: ./apps/${{ env.MODULE }}/nais/nais-dev.yaml
           VAR: image=${{ needs.build.outputs.image }}
 
-#  deploy-prod:
-#    if: github.ref == 'refs/heads/main'
-#    name: Deploy to prod-gcp
-#    needs:
-#      - build
-#      - deploy-dev
-#    permissions:
-#      contents: read
-#      id-token: write
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v4
-#      - name: Deploy to GCP
-#        uses: nais/deploy/actions/deploy@v2
-#        env:
-#          TEAM: paw
-#          CLUSTER: prod-gcp
-#          RESOURCE: ./apps/${{ env.MODULE }}/nais/nais-prod.yaml
-#          VAR: image=${{ needs.build.outputs.image }}
+  deploy-prod:
+    if: github.ref == 'refs/heads/main'
+    name: Deploy to prod-gcp
+    needs:
+      - build
+      - deploy-dev
+    permissions:
+      contents: read
+      id-token: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Deploy to GCP
+        uses: nais/deploy/actions/deploy@v2
+        env:
+          TEAM: paw
+          CLUSTER: prod-gcp
+          RESOURCE: ./apps/${{ env.MODULE }}/nais/nais-prod.yaml
+          VAR: image=${{ needs.build.outputs.image }}
diff --git a/apps/bekreftelse-api/nais/nais-prod.yaml b/apps/bekreftelse-api/nais/nais-prod.yaml
index a084eced..9cbb5c15 100644
--- a/apps/bekreftelse-api/nais/nais-prod.yaml
+++ b/apps/bekreftelse-api/nais/nais-prod.yaml
@@ -12,9 +12,9 @@ spec:
     - name: CORS_ALLOW_ORIGINS
       value: "www.intern.nav.no"
     - name: KAFKA_PAW_ARBEIDSSOKER_BEKREFTELSE_TOPIC
-      value: "paw.arbeidssoker-bekreftelse-v1"
+      value: "paw.arbeidssoker-bekreftelse-beta-v1"
     - name: KAFKA_PAW_ARBEIDSSOKER_BEKREFTELSE_HENDELSESLOGG_TOPIC
-      value: "paw.arbeidssoker-bekreftelse-hendelseslogg-v1"
+      value: "paw.arbeidssoker-bekreftelse-hendelseslogg-beta-v1"
     - name: KAFKA_KEYS_SCOPE
       value: "api://prod-gcp.paw.paw-kafka-key-generator/.default"
   replicas:
diff --git a/apps/kafka-key-generator/nais/nais-dev.yaml b/apps/kafka-key-generator/nais/nais-dev.yaml
index c2714c07..b6144012 100644
--- a/apps/kafka-key-generator/nais/nais-dev.yaml
+++ b/apps/kafka-key-generator/nais/nais-dev.yaml
@@ -63,13 +63,13 @@ spec:
           - host: pdl-api.dev-fss-pub.nais.io
       inbound:
         rules:
+          - application: paw-brukerstotte
+          - application: paw-kafka-key-maintenance
+          - application: paw-microfrontend-toggler
           - application: paw-arbeidssokerregisteret-api-inngang
-          - application: paw-arbeidssoekerregisteret-utgang-formidlingsgruppe
           - application: paw-arbeidssoekerregisteret-utgang-pdl
-          - application: paw-microfrontend-toggler
+          - application: paw-arbeidssoekerregisteret-utgang-formidlingsgruppe
           - application: paw-arbeidssoekerregisteret-hendelselogg-backup
           - application: paw-arbeidssoekerregisteret-api-bekreftelse
           - application: paw-arbeidssoekerregisteret-bekreftelse-tjeneste
           - application: paw-arbeidssoekerregisteret-bekreftelse-min-side-varsler
-          - application: paw-brukerstotte
-          - application: paw-kafka-key-maintenance
diff --git a/apps/kafka-key-generator/nais/nais-prod.yaml b/apps/kafka-key-generator/nais/nais-prod.yaml
index e1278bf7..0039b915 100644
--- a/apps/kafka-key-generator/nais/nais-prod.yaml
+++ b/apps/kafka-key-generator/nais/nais-prod.yaml
@@ -60,10 +60,11 @@ spec:
           - host: pdl-api.prod-fss-pub.nais.io
       inbound:
         rules:
-          - application: paw-arbeidssoekerregisteret-utgang-formidlingsgruppe
+          - application: paw-brukerstotte
+          - application: paw-microfrontend-toggler
+          - application: paw-kafka-key-maintenance
           - application: paw-arbeidssokerregisteret-api-inngang
           - application: paw-arbeidssoekerregisteret-utgang-pdl
-          - application: paw-microfrontend-toggler
+          - application: paw-arbeidssoekerregisteret-utgang-formidlingsgruppe
           - application: paw-arbeidssoekerregisteret-hendelselogg-backup
-          - application: paw-brukerstotte
-          - application: paw-kafka-key-maintenance
+          - application: paw-arbeidssoekerregisteret-api-bekreftelse