@@ -59,31 +59,37 @@ jobs:
59
59
deploy-dev :
60
60
name : Deploy dev
61
61
permissions :
62
- id-token : write
63
- contents : write
62
+ id-token : read
63
+ contents : read
64
64
needs : [ build, test ]
65
- # ser litt rart ut å bruke 'maven-deploy', siden dette er en gradle-applikasjon, men den inneholder ikke noe spesifikt for maven
66
- uses : navikt/sif-gha-workflows/.github/workflows/maven-deploy.yml@main
67
- with :
68
- gar : true
69
- image : ${{ needs.build.outputs.image }}
70
- namespace : k9saksbehandling
71
- cluster : dev-fss
72
- input_vars_file : nais/dev-fss.json
73
- secrets : inherit
65
+ environment : " dev-fss:k9saksbehandling"
66
+ concurrency : " dev-fss:k9saksbehandling"
67
+ steps :
68
+ - uses : actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # ratchet:actions/checkout@v3
69
+ - name : Deploy til dev-fss
70
+ uses : nais/deploy/actions/deploy@c73efa8384743a5c14b94d4a4b9c1cf5a260b532 # ratchet:nais/deploy/actions/deploy@v2
71
+ env :
72
+ IMAGE : ${{ needs.build.outputs.image }}
73
+ APIKEY : ${{ secrets.NAIS_DEPLOY_APIKEY }}
74
+ CLUSTER : dev-fss
75
+ RESOURCE : nais/naiserator.yaml
76
+ VARS : nais/dev-fss.json
74
77
75
78
deploy-prod :
76
79
name : Deploy prod
77
80
permissions :
78
- id-token : write
79
- contents : write
80
- needs : [ build, test ]
81
- # ser litt rart ut å bruke 'maven-deploy', siden dette er en gradle-applikasjon, men den inneholder ikke noe spesifikt for maven
82
- uses : navikt/sif-gha-workflows/.github/workflows/maven-deploy.yml@main
83
- with :
84
- gar : true
85
- image : ${{ needs.build.outputs.image }}
86
- namespace : k9saksbehandling
87
- cluster : prod-fss
88
- input_vars_file : nais/prod-fss.json
89
- secrets : inherit
81
+ id-token : read
82
+ contents : read
83
+ needs : [ build, test, deploy-dev ]
84
+ environment : " prod-fss:k9saksbehandling"
85
+ concurrency : " prod-fss:k9saksbehandling"
86
+ steps :
87
+ - uses : actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # ratchet:actions/checkout@v3
88
+ - name : Deploy til prod-fss
89
+ uses : nais/deploy/actions/deploy@c73efa8384743a5c14b94d4a4b9c1cf5a260b532 # ratchet:nais/deploy/actions/deploy@v2
90
+ env :
91
+ IMAGE : ${{ needs.build.outputs.image }}
92
+ APIKEY : ${{ secrets.NAIS_DEPLOY_APIKEY }}
93
+ CLUSTER : prod-fss
94
+ RESOURCE : nais/naiserator.yaml
95
+ VARS : nais/prod-fss.json
0 commit comments