Skip to content

Commit

Permalink
Bump nais/deploy from 1 to 2 (#999)
Browse files Browse the repository at this point in the history
* Bump nais/deploy from 1 to 2

Bumps [nais/deploy](https://github.com/nais/deploy) from 1 to 2.
- [Release notes](https://github.com/nais/deploy/releases)
- [Commits](nais/deploy@v1...v2)

---
updated-dependencies:
- dependency-name: nais/deploy
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Endrer til VAR image= i deployfila

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stig Helge Strøm <stig.helge.strom@nav.no>
  • Loading branch information
dependabot[bot] and stigebil authored Dec 15, 2023
1 parent f1e1709 commit 94b0c2a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-deploy-preprod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,9 @@ jobs:
- uses: actions/checkout@v4
- name: Deploy til dev-gcp team namespace
if: (github.triggering_actor != 'dependabot[bot]' || github.event_name != 'merge_group')
uses: nais/deploy/actions/deploy@v1
uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: dev-gcp
RESOURCE: .deploy/nais/app-preprod.yaml
IMAGE: ${{ needs.build-dev.outputs.image }}
VAR: image=${{ needs.build-dev.outputs.image }}
6 changes: 3 additions & 3 deletions .github/workflows/build-and-deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ jobs:
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
byosbom: target/bom.json
- name: Deploy til dev-gcp
uses: nais/deploy/actions/deploy@v1
uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: dev-gcp
RESOURCE: .deploy/nais/app-preprod.yaml
IMAGE: ${{ steps.docker-push.outputs.image }}
- name: Deploy til prod-gcp
if: github.ref == 'refs/heads/main'
uses: nais/deploy/actions/deploy@v1
uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: prod-gcp
RESOURCE: .deploy/nais/app-prod.yaml
IMAGE: ${{ steps.docker-push.outputs.image }}
VAR: image=${{ steps.docker-push.outputs.image }}
2 changes: 1 addition & 1 deletion .github/workflows/krise-rett-i-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Push Docker image med 'latest' tag
run: docker push ${IMAGE_LATEST}
- name: Deploy til prod-gcp
uses: nais/deploy/actions/deploy@v1
uses: nais/deploy/actions/deploy@v2
env:
APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
CLUSTER: prod-gcp
Expand Down

0 comments on commit 94b0c2a

Please sign in to comment.