Bump nais/deploy from 1 to 2 (#4250)

Bumps [nais/deploy](https://github.com/nais/deploy) from 1 to 2. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/nais/deploy/commit/efaf4f38a6aea33831017fd820eb03ca53aa0f34"><code>efaf4f3</code></a> Merge branch 'master' of <a href="https://github.com/nais/deploy">https://github.com/nais/deploy</a></li> <li><a href="https://github.com/nais/deploy/commit/c0e03759f3e4a3d10df1ab3a9169484e09caa32b"><code>c0e0375</code></a> implement streamserverinterceptor</li> <li><a href="https://github.com/nais/deploy/commit/9ae3199fee6dd5bed01b0c6de4e3be6e7c9ed3a2"><code>9ae3199</code></a> only add mask if var is set</li> <li><a href="https://github.com/nais/deploy/commit/48323241ab33acf7e4b572e0236d26637efa30ea"><code>4832324</code></a> Update Dockerfile</li> <li><a href="https://github.com/nais/deploy/commit/87d3cc29c8e8a57cd8bf3df27bf1bd7e16d1988a"><code>87d3cc2</code></a> fix(deploy-action): export correct variable</li> <li><a href="https://github.com/nais/deploy/commit/0a28aa95e4dde7de212e1fa946d667b384be6df9"><code>0a28aa9</code></a> fix(deploy-action): update image tag for v2</li> <li><a href="https://github.com/nais/deploy/commit/2a6e26f6bb37f12e6afd1d76b98394e093bec8be"><code>2a6e26f</code></a> fix(chart): add netpol for hookd</li> <li><a href="https://github.com/nais/deploy/commit/903d7111d1140a0f4f5fb66d4cf1b977c850acbc"><code>903d711</code></a> Merge pull request <a href="https://redirect.github.com/nais/deploy/issues/179">#179</a> from nais/github_auth</li> <li><a href="https://github.com/nais/deploy/commit/e1192be3a03e6c2f43cc2542e8a57fee1fdc44a8"><code>e1192be</code></a> && -> ||</li> <li><a href="https://github.com/nais/deploy/commit/2b6ae088c5bc3363616c3005e89c964abb44ec95"><code>2b6ae08</code></a> remove redundant assign</li> <li>Additional commits viewable in <a href="https://github.com/nais/deploy/compare/v1...v2">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=nais/deploy&package-manager=github_actions&previous-version=1&new-version=2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
navikt · Dec 15, 2023 · 919e6c7 · 919e6c7
1 parent 193c738
commit 919e6c7
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build-and-deploy-krise-eksisterende-image-rett-i-prod.yml b/.github/workflows/build-and-deploy-krise-eksisterende-image-rett-i-prod.yml
@@ -17,7 +17,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Deploy til prod-gcp
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: prod-gcp

diff --git a/.github/workflows/build-and-deploy-krise-rett-i-prod.yml b/.github/workflows/build-and-deploy-krise-rett-i-prod.yml
@@ -52,7 +52,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Deploy til dev-gcp
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: dev-gcp
@@ -71,7 +71,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Deploy til prod-gcp
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: prod-gcp

diff --git a/.github/workflows/build-and-deploy-preprod.yml b/.github/workflows/build-and-deploy-preprod.yml
@@ -38,7 +38,7 @@ jobs:
           byosbom: target/bom.json
 
       - name: Deploy til dev-gcp
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: dev-gcp

diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml
@@ -58,7 +58,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Deploy til dev-gcp
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: dev-gcp
@@ -77,7 +77,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Deploy til prod-gcp
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: prod-gcp

diff --git a/.github/workflows/manual-deploy-kafka-aiven.yml b/.github/workflows/manual-deploy-kafka-aiven.yml
@@ -10,61 +10,61 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Deploy bisys_opphoer_av_barnetrygd_topic til dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: dev-gcp
           RESOURCE: .deploy/nais/kafka/dev/bisys_opphoer_av_barnetrygd.yaml
       - name: Deploy bisys_opphoer_av_barnetrygd_topic til prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: prod-gcp
           RESOURCE: .deploy/nais/kafka/prod/bisys_opphoer_av_barnetrygd.yaml
       - name: Deploy dvh_vedtak_topic til dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: dev-gcp
           RESOURCE: .deploy/nais/kafka/dev/dvh_vedtak_topic.yaml
       - name: Deploy aapen-familie-ba-sak-identer-med-barnetrygd  til dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: dev-gcp
           RESOURCE: .deploy/nais/kafka/dev/aapen-familie-ba-sak-identer-med-barnetrygd.yaml
       - name: Deploy dvh_vedtak_topic til prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: prod-gcp
           RESOURCE: .deploy/nais/kafka/prod/dvh_vedtak_topic.yaml
       - name: Deploy dvh_saksstatistikk_sak_v1_topic til dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: dev-gcp
           RESOURCE: .deploy/nais/kafka/dev/dvh_saksstatistikk_sak_v1_topic.yaml
       - name: Deploy dvh_saksstatistikk_sak_v1_topic til prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: prod-gcp
           RESOURCE: .deploy/nais/kafka/prod/dvh_saksstatistikk_sak_v1_topic.yaml
       - name: Deploy dvh_sakstatistikk_behandling_v1_topic til dev
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: dev-gcp
           RESOURCE: .deploy/nais/kafka/dev/dvh_sakstatistikk_behandling_v1_topic.yaml
       - name: Deploy dvh_sakstatistikk_behandling_v1_topic til prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: prod-gcp
           RESOURCE: .deploy/nais/kafka/prod/dvh_sakstatistikk_behandling_v1_topic.yaml
       - name: Deploy aapen-familie-ba-sak-identer-med-barnetrygd til prod
-        uses: nais/deploy/actions/deploy@v1
+        uses: nais/deploy/actions/deploy@v2
         env:
           APIKEY: ${{ secrets.GITHUB_ACCESS_TOKEN }}
           CLUSTER: prod-gcp