From dad4ff56a5b44e418ae9b71be5f0ef6d55cba64b Mon Sep 17 00:00:00 2001 From: Jostein Stuhaug Date: Wed, 3 Jul 2024 11:11:48 +0200 Subject: [PATCH 1/3] nais deploy konfigurasjon for dev-next1 oppretta. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- .github/workflows/promote-command.yml | 1 + deploy/dev-fss-k9saksbehandling.yml | 8 ++++---- deploy/dev-next1.yaml | 6 ++++++ deploy/dev.yaml | 6 ++++++ 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 deploy/dev-next1.yaml create mode 100644 deploy/dev.yaml diff --git a/.github/workflows/promote-command.yml b/.github/workflows/promote-command.yml index 83e16d5386..a0bb18922c 100644 --- a/.github/workflows/promote-command.yml +++ b/.github/workflows/promote-command.yml @@ -50,6 +50,7 @@ jobs: PRINT_PAYLOAD: true CLUSTER: ${{ env.CLUSTER }} RESOURCE: deploy/${{ env.CLUSTER }}-k9saksbehandling.yml + VARS: deploy/dev.yaml - name: Oppdater kommentar med deployment status ved feil if: failure() diff --git a/deploy/dev-fss-k9saksbehandling.yml b/deploy/dev-fss-k9saksbehandling.yml index 7f92449e20..5faa7e7960 100644 --- a/deploy/dev-fss-k9saksbehandling.yml +++ b/deploy/dev-fss-k9saksbehandling.yml @@ -1,7 +1,7 @@ apiVersion: "nais.io/v1alpha1" kind: "Application" metadata: - name: k9-sak-web + name: {{ name }} namespace: k9saksbehandling labels: team: k9saksbehandling @@ -25,8 +25,8 @@ spec: initialDelay: 20 timeout: 1 replicas: - min: 2 - max: 3 + min: {{ replicas.min }} + max: {{ replicas.max }} cpuThresholdPercentage: 50 resources: limits: @@ -36,7 +36,7 @@ spec: cpu: 200m memory: 32Mi ingresses: - - "https://k9.dev.intern.nav.no/" + - "{{ ingress }}" env: - name: APP_NAME value: k9-sak-web diff --git a/deploy/dev-next1.yaml b/deploy/dev-next1.yaml new file mode 100644 index 0000000000..a475a14732 --- /dev/null +++ b/deploy/dev-next1.yaml @@ -0,0 +1,6 @@ +# Verdier for dev-fss.k9saksbehandling.yml ved utrulling frå dev-next1 branch til k9.dev-next1.intern.nav.no +name: k9-sak-web-dev-next1 +ingress: "https://k9.dev-next1.intern.nav.no/" +replicas: + min: 1 + max: 2 diff --git a/deploy/dev.yaml b/deploy/dev.yaml new file mode 100644 index 0000000000..0ac0266747 --- /dev/null +++ b/deploy/dev.yaml @@ -0,0 +1,6 @@ +# Verdier for dev-fss.k9saksbehandling.yml ved utrulling frå master til Q +name: k9-sak-web +ingress: "https://k9.dev.intern.nav.no/" +replicas: + min: 2 + max: 3 From 5aebd578554f6829fd56a0c4d202cb368966f046 Mon Sep 17 00:00:00 2001 From: Jostein Stuhaug Date: Wed, 3 Jul 2024 12:52:30 +0200 Subject: [PATCH 2/3] Build and deploy dev-next1 workflow oppretta. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- .github/workflows/dev-next1-deploy.yml | 46 ++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .github/workflows/dev-next1-deploy.yml diff --git a/.github/workflows/dev-next1-deploy.yml b/.github/workflows/dev-next1-deploy.yml new file mode 100644 index 0000000000..448c98fcad --- /dev/null +++ b/.github/workflows/dev-next1-deploy.yml @@ -0,0 +1,46 @@ +name: Build and deploy dev-next1 +on: + push: + paths-ignore: + - '**.md' + - '.gitignore' + - 'CODEOWNERS' + branches: + - dev-next1 + +jobs: + build-deploy: + name: Build and deploy Docker image + runs-on: ubuntu-latest + permissions: + contents: read + id-token: write + env: + CLUSTER: dev-fss + steps: + - name: Hente kode + uses: actions/checkout@v4 + + - name: Setup + Install + uses: ./.github/actions/setup-install + with: + npmAuthToken: ${{ secrets.READER_TOKEN }} + + - name: Bygge dist + run: yarn build + + - name: Build and push to docker registry + uses: nais/docker-build-push@v0 + id: docker-push + with: + tag: 'dev-next1' + team: k9saksbehandling + project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} + identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} + - name: Deploy to nais + uses: nais/deploy/actions/deploy@v2 + env: + CLUSTER: ${{ env.CLUSTER }} + RESOURCE: deploy/${{ env.CLUSTER }}-k9saksbehandling.yml + VARS: deploy/dev-next1.yaml + VAR: image=${{ steps.docker-push.outputs.image }} From d4249cb14cc28c157d337c32c2b1889cd6bc5157 Mon Sep 17 00:00:00 2001 From: Jostein Stuhaug Date: Wed, 3 Jul 2024 13:11:44 +0200 Subject: [PATCH 3/3] Fiks ingress url til gyldig verdi. --- deploy/dev-next1.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/dev-next1.yaml b/deploy/dev-next1.yaml index a475a14732..57c0336468 100644 --- a/deploy/dev-next1.yaml +++ b/deploy/dev-next1.yaml @@ -1,6 +1,6 @@ -# Verdier for dev-fss.k9saksbehandling.yml ved utrulling frå dev-next1 branch til k9.dev-next1.intern.nav.no +# Verdier for dev-fss.k9saksbehandling.yml ved utrulling frå dev-next1 branch til k9-next1.dev.intern.nav.no name: k9-sak-web-dev-next1 -ingress: "https://k9.dev-next1.intern.nav.no/" +ingress: "https://k9-next1.dev.intern.nav.no/" replicas: min: 1 max: 2