Skip to content

Commit 7eb4c55

Browse files
authored
Dev-next1 branch deployment til k9-next.dev.intern.nav.no (#6340)
* nais deploy konfigurasjon for dev-next1 oppretta. name, ingress og replicas konfigurasjon for nais dev deploy trekt ut i separate filer. dev.yaml inneheld samme konfigurasjonsverdier som før var hardkoda i dev-fss-k9saksbehandling.yml, for normal utrulling til Q dev-next1.yaml inneheld konfigurasjonsverdier for utrulling til ny dev-next1 instans. * Build and deploy dev-next1 workflow oppretta. Denne vil ved push til dev-next1 branch bygge og rulle ut instans av k9-sak-web til k9.dev-next1.intern.navn.no, slik at meir eksperimentelle ting kan testast der før det går til master. * Fiks ingress url til gyldig verdi.
1 parent 0a899fb commit 7eb4c55

File tree

5 files changed

+63
-4
lines changed

5 files changed

+63
-4
lines changed
+46
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: Build and deploy dev-next1
2+
on:
3+
push:
4+
paths-ignore:
5+
- '**.md'
6+
- '.gitignore'
7+
- 'CODEOWNERS'
8+
branches:
9+
- dev-next1
10+
11+
jobs:
12+
build-deploy:
13+
name: Build and deploy Docker image
14+
runs-on: ubuntu-latest
15+
permissions:
16+
contents: read
17+
id-token: write
18+
env:
19+
CLUSTER: dev-fss
20+
steps:
21+
- name: Hente kode
22+
uses: actions/checkout@v4
23+
24+
- name: Setup + Install
25+
uses: ./.github/actions/setup-install
26+
with:
27+
npmAuthToken: ${{ secrets.READER_TOKEN }}
28+
29+
- name: Bygge dist
30+
run: yarn build
31+
32+
- name: Build and push to docker registry
33+
uses: nais/docker-build-push@v0
34+
id: docker-push
35+
with:
36+
tag: 'dev-next1'
37+
team: k9saksbehandling
38+
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
39+
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
40+
- name: Deploy to nais
41+
uses: nais/deploy/actions/deploy@v2
42+
env:
43+
CLUSTER: ${{ env.CLUSTER }}
44+
RESOURCE: deploy/${{ env.CLUSTER }}-k9saksbehandling.yml
45+
VARS: deploy/dev-next1.yaml
46+
VAR: image=${{ steps.docker-push.outputs.image }}

.github/workflows/promote-command.yml

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ jobs:
5050
PRINT_PAYLOAD: true
5151
CLUSTER: ${{ env.CLUSTER }}
5252
RESOURCE: deploy/${{ env.CLUSTER }}-k9saksbehandling.yml
53+
VARS: deploy/dev.yaml
5354

5455
- name: Oppdater kommentar med deployment status ved feil
5556
if: failure()

deploy/dev-fss-k9saksbehandling.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: "nais.io/v1alpha1"
22
kind: "Application"
33
metadata:
4-
name: k9-sak-web
4+
name: {{ name }}
55
namespace: k9saksbehandling
66
labels:
77
team: k9saksbehandling
@@ -25,8 +25,8 @@ spec:
2525
initialDelay: 20
2626
timeout: 1
2727
replicas:
28-
min: 2
29-
max: 3
28+
min: {{ replicas.min }}
29+
max: {{ replicas.max }}
3030
cpuThresholdPercentage: 50
3131
resources:
3232
limits:
@@ -36,7 +36,7 @@ spec:
3636
cpu: 200m
3737
memory: 32Mi
3838
ingresses:
39-
- "https://k9.dev.intern.nav.no/"
39+
- "{{ ingress }}"
4040
env:
4141
- name: APP_NAME
4242
value: k9-sak-web

deploy/dev-next1.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Verdier for dev-fss.k9saksbehandling.yml ved utrulling frå dev-next1 branch til k9-next1.dev.intern.nav.no
2+
name: k9-sak-web-dev-next1
3+
ingress: "https://k9-next1.dev.intern.nav.no/"
4+
replicas:
5+
min: 1
6+
max: 2

deploy/dev.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Verdier for dev-fss.k9saksbehandling.yml ved utrulling frå master til Q
2+
name: k9-sak-web
3+
ingress: "https://k9.dev.intern.nav.no/"
4+
replicas:
5+
min: 2
6+
max: 3

0 commit comments

Comments
 (0)