Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin' into Bruke-Aksel-kompontent-i-s…
Browse files Browse the repository at this point in the history
…økefeltet
  • Loading branch information
eivindskifjeld committed May 7, 2024
2 parents 38ee9f6 + ddf3bee commit 9e7ae3f
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ENV=localhost
XP_BASE_URL=https://www.nav.no
SEARCH_URL=https://navno-search-api.intern.nav.no
SEARCH_URL=https://navno-search-api.nav.no
APP_BASE_URL=http://localhost:8088
APP_BASE_PATH=/dekoratoren
API_XP_SERVICES_URL=https://www.nav.no/_/service
Expand Down
25 changes: 25 additions & 0 deletions .github/workflows/deploy.dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Deploy to stable dev
on:
workflow_dispatch:
inputs:
build_mode:
type: choice
required: true
description: 'Build-time NODE_ENV'
default: 'prod'
options:
- prod
- dev

jobs:
deploy:
permissions:
packages: write
id-token: write
uses: ./.github/workflows/build-and-deploy.yml
with:
NAIS_VARS: .nais/vars/dev-stable.yaml
IMAGE_NAME: dev-stable
CLUSTER: dev-gcp
BUILD_MODE: ${{ inputs.build_mode }}
secrets: inherit
37 changes: 37 additions & 0 deletions .nais/vars/dev-stable.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
appName: nav-dekoratoren
appPath: ''
ingresses:
- https://dekoratoren.ekstern.dev.nav.no
outboundHosts:
- portal-admin-dev.oera.no
- navno-unleash-api.nav.cloud.nais.io
env:
- name: ENV
value: dev
- name: XP_BASE_URL
value: https://www.ekstern.dev.nav.no
- name: APP_BASE_URL
value: https://dekoratoren.ekstern.dev.nav.no
- name: API_XP_SERVICES_URL
value: https://portal-admin-dev.oera.no/_/service
- name: API_DEKORATOREN_URL
value: https://www.ekstern.dev.nav.no/person/nav-dekoratoren-api
- name: MINSIDE_ARBEIDSGIVER_URL
value: https://arbeidsgiver.intern.dev.nav.no/min-side-arbeidsgiver/
- name: MIN_SIDE_URL
value: https://www.intern.dev.nav.no/minside/
- name: LOGIN_URL
value: https://login.ekstern.dev.nav.no/oauth2/login
- name: LOGOUT_URL
value: https://login.ekstern.dev.nav.no/oauth2/logout
- name: VARSEL_API_URL
value: https://www.intern.dev.nav.no/tms-varsel-api
replicas:
min: 1
max: 2
resources:
limits:
memory: 1024Mi
requests:
cpu: 200m
memory: 128Mi
4 changes: 2 additions & 2 deletions .nais/vars/prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ ingresses:
outboundHosts:
- www.nav.no
- navno-unleash-api.nav.cloud.nais.io
- navno-search-api.intern.nav.no
- navno-search-api.nav.no
env:
- name: ENV
value: prod
- name: XP_BASE_URL
value: https://www.nav.no
- name: SEARCH_URL
value: https://navno-search-api.intern.nav.no
value: https://navno-search-api.nav.no
- name: APP_BASE_URL
value: https://www.nav.no
- name: APP_BASE_PATH
Expand Down

0 comments on commit 9e7ae3f

Please sign in to comment.