Merge branch 'main' into sak-oppdatert

navikt · Feb 17, 2025 · d64531f · d64531f
2 parents 0508909 + 179ad2a
commit d64531f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/platform_build_and_deploy.yaml b/.github/workflows/platform_build_and_deploy.yaml
@@ -66,7 +66,6 @@ jobs:
         working-directory: app
 
       - uses: nais/docker-build-push@v0
-        if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
         id: gar-push
         with:
           team: fager
@@ -78,7 +77,7 @@ jobs:
           byosbom: app/target/bom.json
 
   deploy:
-    if: github.ref == 'refs/heads/main' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
+    if: github.ref == 'refs/heads/main'
     needs: [build]
     runs-on: ubuntu-latest
     permissions:

diff --git a/.github/workflows/platform_deploy_kafka_topic.yaml b/.github/workflows/platform_deploy_kafka_topic.yaml
@@ -2,7 +2,7 @@ name: "Platform: deploy kafka topic"
 on:
   push:
     branches: ['main']
-    paths: ['config/nais-kafka-topic.yaml', 'config/nais-kafka-topic-ekstern-varsling-status.yaml']
+    paths: ['app/nais/nais-kafka-topic.yaml', 'app/nais/nais-kafka-topic-ekstern-varsling-status.yaml']
   workflow_dispatch:
 
 jobs:

diff --git a/app/nais/nais-kafka-topic.yaml b/app/nais/nais-kafka-topic.yaml
@@ -58,3 +58,6 @@ spec:
     - application: notifikasjon-dataprodukt
       team: fager
       access: read
+    - application: notifikasjon-kafka-bq
+      team: fager
+      access: read