From 48fa2f5e5d6308bfa52b514a414d8f6d0088e2e6 Mon Sep 17 00:00:00 2001
From: Oleksandr Chmyr <oleksandr.chmyr@nav.no>
Date: Wed, 15 Jan 2025 16:15:36 +0100
Subject: [PATCH] =?UTF-8?q?Lagt=20til=20Kafka=20topic=20configurasjon=20fo?=
 =?UTF-8?q?r=20prod-milj=C3=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/kafka-dev.yaml  |  8 +++--
 .github/workflows/kafka-prod.yaml | 23 ++++++++++++
 .nais/kafka/kafka-dev.yaml        | 24 +++++++++----
 .nais/kafka/kafka-prod.yaml       | 59 +++++++++++++++++++++++++++++++
 4 files changed, 105 insertions(+), 9 deletions(-)
 create mode 100644 .github/workflows/kafka-prod.yaml
 create mode 100644 .nais/kafka/kafka-prod.yaml

diff --git a/.github/workflows/kafka-dev.yaml b/.github/workflows/kafka-dev.yaml
index 52ce584a9..57bb460b0 100644
--- a/.github/workflows/kafka-dev.yaml
+++ b/.github/workflows/kafka-dev.yaml
@@ -14,13 +14,15 @@ jobs:
   deploy-to-dev:
     name: Deploy to dev-gcp
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
     steps:
       - name: Checkout
         uses: actions/checkout@v4
       - name: Deploy topics to dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CLUSTER: dev-gcp
-          VAR: kafka-pool=nav-dev
           RESOURCE: ${{ env.TOPIC_FILE }}
diff --git a/.github/workflows/kafka-prod.yaml b/.github/workflows/kafka-prod.yaml
new file mode 100644
index 000000000..c38a4de1c
--- /dev/null
+++ b/.github/workflows/kafka-prod.yaml
@@ -0,0 +1,23 @@
+name: Deploy kafka topics to PROD
+on:
+  workflow_dispatch:
+
+env:
+  TOPIC_FILE: .nais/kafka/kafka-prod.yaml
+
+jobs:
+  deploy-to-prod:
+    name: Deploy to prod-gcp
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Deploy topics to PROD
+        uses: nais/deploy/actions/deploy@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CLUSTER: prod-gcp
+          RESOURCE: ${{ env.TOPIC_FILE }}
diff --git a/.nais/kafka/kafka-dev.yaml b/.nais/kafka/kafka-dev.yaml
index 7b0d0ab8c..8b3e9e6b8 100644
--- a/.nais/kafka/kafka-dev.yaml
+++ b/.nais/kafka/kafka-dev.yaml
@@ -3,10 +3,10 @@ kind: Topic
 metadata:
   labels:
     team: team-emottak
-  name: ebxml-payload-outgoing
+  name: smtp.out.ebxml.signal
   namespace: team-emottak
 spec:
-  pool: {{kafka-pool}}
+  pool: nav-dev
   config:
     cleanupPolicy: delete
     maxMessageBytes: 1048588
@@ -17,9 +17,15 @@ spec:
     retentionHours: 168
     segmentHours: 168
   acl:
-    - access: read
+    - access: write
       application: ebxml-processor
       team: team-emottak
+    - access: read
+      application: smtp-transport
+      team: team-emottak
+    - access: read
+      application: emottak-kafka-manager
+      team: team-emottak
 
 ---
 
@@ -28,10 +34,10 @@ kind: Topic
 metadata:
   labels:
     team: team-emottak
-  name: ebxml-payload-deenveloped
+  name: smtp.out.ebxml.payload
   namespace: team-emottak
 spec:
-  pool: {{kafka-pool}}
+  pool: nav-dev
   config:
     cleanupPolicy: delete
     maxMessageBytes: 1048588
@@ -44,4 +50,10 @@ spec:
   acl:
     - access: write
       application: ebxml-processor
-      team: team-emottak
\ No newline at end of file
+      team: team-emottak
+    - access: read
+      application: smtp-transport
+      team: team-emottak
+    - access: read
+      application: emottak-kafka-manager
+      team: team-emottak
diff --git a/.nais/kafka/kafka-prod.yaml b/.nais/kafka/kafka-prod.yaml
new file mode 100644
index 000000000..756a52ad3
--- /dev/null
+++ b/.nais/kafka/kafka-prod.yaml
@@ -0,0 +1,59 @@
+apiVersion: kafka.nais.io/v1
+kind: Topic
+metadata:
+  labels:
+    team: team-emottak
+  name: smtp.out.ebxml.signal
+  namespace: team-emottak
+spec:
+  pool: nav-prod
+  config:
+    cleanupPolicy: delete
+    maxMessageBytes: 1048588
+    minimumInSyncReplicas: 2
+    partitions: 1
+    replication: 3
+    retentionBytes: -1
+    retentionHours: 4380
+    segmentHours: 168
+  acl:
+    - access: write
+      application: ebxml-processor
+      team: team-emottak
+    - access: read
+      application: smtp-transport
+      team: team-emottak
+    - access: read
+      application: emottak-kafka-manager
+      team: team-emottak
+
+---
+
+apiVersion: kafka.nais.io/v1
+kind: Topic
+metadata:
+  labels:
+    team: team-emottak
+  name: smtp.out.ebxml.payload
+  namespace: team-emottak
+spec:
+  pool: nav-prod
+  config:
+    cleanupPolicy: delete
+    maxMessageBytes: 1048588
+    minimumInSyncReplicas: 2
+    partitions: 1
+    replication: 3
+    retentionBytes: -1
+    retentionHours: 4380
+    segmentHours: 168
+  acl:
+    - access: write
+      application: ebxml-processor
+      team: team-emottak
+    - access: read
+      application: smtp-transport
+      team: team-emottak
+    - access: read
+      application: emottak-kafka-manager
+      team: team-emottak