Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev-next1 branch deployment til k9-next.dev.intern.nav.no #6340

Merged
merged 3 commits into from
Jul 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions .github/workflows/dev-next1-deploy.yml
Original file line number Diff line number Diff line change
@@ -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 }}
1 change: 1 addition & 0 deletions .github/workflows/promote-command.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
8 changes: 4 additions & 4 deletions deploy/dev-fss-k9saksbehandling.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: "nais.io/v1alpha1"
kind: "Application"
metadata:
name: k9-sak-web
name: {{ name }}
namespace: k9saksbehandling
labels:
team: k9saksbehandling
Expand All @@ -25,8 +25,8 @@ spec:
initialDelay: 20
timeout: 1
replicas:
min: 2
max: 3
min: {{ replicas.min }}
max: {{ replicas.max }}
cpuThresholdPercentage: 50
resources:
limits:
Expand All @@ -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
Expand Down
6 changes: 6 additions & 0 deletions deploy/dev-next1.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# 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-next1.dev.intern.nav.no/"
replicas:
min: 1
max: 2
6 changes: 6 additions & 0 deletions deploy/dev.yaml
Original file line number Diff line number Diff line change
@@ -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