Skip to content

Commit

Permalink
Merge pull request #342 from navikt/tech/delingslenke
Browse files Browse the repository at this point in the history
Delingslenke-applikasjon
  • Loading branch information
akgagnat authored Sep 23, 2024
2 parents 01c229c + 215e982 commit 57d15df
Show file tree
Hide file tree
Showing 7 changed files with 119 additions and 12 deletions.
6 changes: 6 additions & 0 deletions .github/workflows/manual-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
options:
- preprod
- preprod-alt
- preprod-delingslenke
- prod
permissions:
contents: 'read'
Expand All @@ -28,6 +29,11 @@ jobs:
uses: ./.github/workflows/preprod-alt.yml
secrets: inherit

preprod-delingslenke:
if: inputs.environment == 'preprod-delingslenke'
uses: ./.github/workflows/preprod-delingslenke.yml
secrets: inherit

prod:
if: inputs.environment == 'prod'
uses: ./.github/workflows/main.yml
Expand Down
41 changes: 41 additions & 0 deletions .github/workflows/preprod-delingslenke.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Build, push, and deploy (preprod-delingslenke)
on:
push:
branches:
- 'main'
paths-ignore:
- '**.md'
- '**/**.md'
workflow_call:

jobs:
build-and-test:
name: Test frontend
uses: ./.github/workflows/test.yml

build-and-push:
name: Build and push Docker container for preprod
uses: ./.github/workflows/build-push.yml
with:
environment: preprod-delingslenke
secrets: inherit
permissions:
contents: 'read'
id-token: 'write'
packages: 'read'

deploy-preprod:
name: Deploy to preprod-delingslenke
needs: [build-and-test, build-and-push]
runs-on: ubuntu-latest
permissions:
id-token: write
steps:
- uses: actions/checkout@v4
- uses: nais/deploy/actions/deploy@v2
env:
DRY_RUN: false
PRINT_PAYLOAD: true
CLUSTER: dev-gcp
RESOURCE: .nais/nais-preprod-delingslenke.yml
VAR: app_version=${{ github.sha }},image=${{ needs.build-and-push.outputs.image }}
4 changes: 0 additions & 4 deletions .nais/nais-preprod-alt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ spec:
tokenx:
enabled: true
accessPolicy:
inbound:
rules:
- application: statuspoll
namespace: navdig
outbound:
rules:
- application: innsending-api
Expand Down
63 changes: 63 additions & 0 deletions .nais/nais-preprod-delingslenke.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
apiVersion: 'nais.io/v1alpha1'
kind: 'Application'
metadata:
name: send-inn-frontend-delingslenke
namespace: team-soknad
labels:
team: team-soknad
annotations:
nginx.ingress.kubernetes.io/proxy-body-size: '50M'
nginx.ingress.kubernetes.io/proxy-read-timeout: '300'
spec:
image: '{{ image }}'
port: 3100
liveness:
path: /sendinn-delingslenke/api/isAlive
initialDelay: 20
timeout: 10
periodSeconds: 5
failureThreshold: 10
readiness:
path: /sendinn-delingslenke/api/isReady
initialDelay: 20
timeout: 10
replicas:
min: 1
max: 2
cpuThresholdPercentage: 50
prometheus:
enabled: true
path: /sendinn-delingslenke/api/internal/prometheus
resources:
limits:
memory: 786Mi
requests:
memory: 512Mi
idporten:
enabled: true
sidecar:
enabled: true
level: Level4
tokenx:
enabled: true
accessPolicy:
outbound:
rules:
- application: innsending-api
- application: skjemautfylling-delingslenke
namespace: skjemadigitalisering
- application: nav-dekoratoren
namespace: personbruker
ingresses:
- 'https://www.ansatt.dev.nav.no/sendinn-delingslenke'
env:
- name: APP_VERSION
value: {{ app_version }}
- name: INNSENDING_API_AUDIENCE
value: 'dev-gcp:team-soknad:innsending-api'
- name: REMOTE_API_URL
value: 'http://innsending-api'
- name: FYLLUT_API_URL
value: http://skjemautfylling-delingslenke.skjemadigitalisering/fyllut
- name: LOG_LINK
value: https://logs.adeo.no/app/discover#/view/b80c8870-6da3-11ee-b740-7d0ae42f37a4
4 changes: 0 additions & 4 deletions .nais/nais-preprod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ spec:
tokenx:
enabled: true
accessPolicy:
inbound:
rules:
- application: statuspoll
namespace: navdig
outbound:
rules:
- application: innsending-api
Expand Down
4 changes: 0 additions & 4 deletions .nais/nais.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ spec:
tokenx:
enabled: true
accessPolicy:
inbound:
rules:
- application: statuspoll
namespace: navdig
outbound:
rules:
- application: innsending-api
Expand Down
9 changes: 9 additions & 0 deletions environments/preprod-delingslenke.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
NEXT_PUBLIC_API_URL=/api/backend
NEXT_PUBLIC_BASE_PATH=/sendinn-delingslenke
DECORATOR_ENV=dev
NEXT_PUBLIC_MIN_SIDE_URL=https://www.intern.dev.nav.no/minside/
NEXT_PUBLIC_DOKUMENTARKIV_URL=https://www.intern.dev.nav.no/dokumentarkiv/
NEXT_PUBLIC_SENTRY_ENV=preprod-delingslenke
NEXT_PUBLIC_MAX_FILE_SIZE_IN_MB=50
NEXT_PUBLIC_FYLLUT_URL=https://skjemadelingslenke.ekstern.dev.nav.no/fyllut
NEXT_PUBLIC_NAIS_CLUSTER_NAME=dev-gcp

0 comments on commit 57d15df

Please sign in to comment.