Skip to content

Commit

Permalink
Merge pull request #576 from navikt/gcp-migration
Browse files Browse the repository at this point in the history
GCP migration
  • Loading branch information
Mathiamu authored Oct 15, 2024
2 parents d0bf8a9 + e930be2 commit ebc1783
Show file tree
Hide file tree
Showing 90 changed files with 747 additions and 906 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-push-deploy-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ jobs:
uses: nais/deploy/actions/deploy@v2
env:
CLUSTER: dev-fss
RESOURCE: .nais/application/application-config-dev.yaml
RESOURCE: .nais/application/gcp/application-config-dev.yaml
VAR: image=${{ needs.build-and-push.outputs.image }}
4 changes: 2 additions & 2 deletions .github/workflows/deploy-unleash-apitoken.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
uses: nais/deploy/actions/deploy@v2
env:
CLUSTER: dev-fss
RESOURCE: .nais/application/unleash-apitoken-dev.yaml
RESOURCE: .nais/application/gcp/unleash-apitoken-dev.yaml
PRINT_PAYLOAD: true

deploy-prod:
Expand All @@ -39,5 +39,5 @@ jobs:
if: github.ref == 'refs/heads/master'
env:
CLUSTER: prod-fss
RESOURCE: .nais/application/unleash-apitoken-prod.yaml
RESOURCE: .nais/application/gcp-unleash-apitoken-prod.yaml
PRINT_PAYLOAD: true
89 changes: 0 additions & 89 deletions .github/workflows/gcp-codeql.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/gcp-deploy-alerts-to-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
branches:
- 'master'
paths:
- '.github/workflows/gcp/gcp-deploy-alerts-to-prod.yaml'
- '.github/workflows/gcp-deploy-alerts-to-prod.yaml'
- '.nais/alerts/alerts-config-prod.yaml'
workflow_dispatch:
permissions:
Expand Down
52 changes: 0 additions & 52 deletions .github/workflows/gcp/build-push-deploy-dev.yml

This file was deleted.

89 changes: 0 additions & 89 deletions .github/workflows/gcp/codeql.yml

This file was deleted.

27 changes: 0 additions & 27 deletions .github/workflows/gcp/deploy-alerts-to-prod.yaml

This file was deleted.

44 changes: 0 additions & 44 deletions .github/workflows/gcp/deploy-unleash-apitoken.yaml

This file was deleted.

Loading

0 comments on commit ebc1783

Please sign in to comment.