Skip to content

Commit ec1eb7b

Browse files
hallvardastarkhallvardastark
authored
Merge branch 'master' into etablert-tilsyn-forbedringer
2 parents 43682d6 + e8d99db commit ec1eb7b

File tree

471 files changed

+15491
-5241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

471 files changed

+15491
-5241
lines changed

‎.github/workflows/ung-sak-web-build-deploy.yml

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: Build and deploy ung-sak-web
2+
on:
3+
push:
4+
paths-ignore:
5+
- '**.md'
6+
- '.gitignore'
7+
- 'CODEOWNERS'
8+
branches:
9+
- master
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-gcp
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:ung
31+
32+
- name: Opprett release med Sentry
33+
run: yarn sentry-release-ung
34+
env:
35+
SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
36+
37+
- name: Build and push to docker registry
38+
uses: navikt/sif-gha-workflows/.github/actions/maven/build-push-docker-image@main
39+
id: docker-push
40+
with:
41+
image_base_name: 'ung-sak-web'
42+
without_navikt_prefix: true
43+
#Konfigurerer for bygging av ung docker image:
44+
build-args: |
45+
featureToggles=ung.feature-toggles.json
46+
proxyConfig=ung.proxy.nginx
47+
appVariant=ung
48+
port=9005
49+
labels: |
50+
org.opencontainers.image.title=ung-sak-web
51+
org.opencontainers.image.description=Frontend for ung-sak
52+
project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
53+
identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
54+
push-image: true
55+
- name: Deploy to nais
56+
uses: nais/deploy/actions/deploy@v2
57+
env:
58+
CLUSTER: ${{ env.CLUSTER }}
59+
RESOURCE: deploy/ung/${{ env.CLUSTER }}.yml
60+
VAR: image=${{ steps.docker-push.outputs.image }}

‎Dockerfile

+11-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
FROM nginxinc/nginx-unprivileged:stable-alpine-slim
2+
# These must be set when building for ung-sak-web. Defaults are for k9-sak-web
3+
ARG proxyConfig=proxy.nginx
4+
ARG featureToggles=feature-toggles.json
5+
ARG appVariant=k9
6+
ARG port=9000
27

38
LABEL org.opencontainers.image.source=https://github.com/navikt/k9-sak-web
49

5-
ADD proxy.nginx /etc/nginx/conf.d/app.conf.template
6-
ADD feature-toggles.json /etc/nginx/conf.d/feature-toggles.json
10+
ADD $proxyConfig /etc/nginx/conf.d/app.conf.template
11+
ADD $featureToggles /etc/nginx/conf.d/feature-toggles.json
712
ADD start-server.sh /start-server.sh
813

914
ENV APP_DIR="/app" \
10-
APP_PATH_PREFIX="/k9/sak" \
11-
APP_CALLBACK_PATH="/k9/sak/cb" \
12-
APP_URL_SAK="http://k9-sak"
15+
APP_PATH_PREFIX="/$appVariant/sak" \
16+
APP_CALLBACK_PATH="/$appVariant/sak/cb" \
17+
APP_URL_SAK="http://$appVariant-sak"
1318

1419
COPY dist /usr/share/nginx/html
1520

16-
EXPOSE 9000
21+
EXPOSE $port
1722

1823
# using bash over sh for better signal-handling
1924
CMD sh /start-server.sh

‎_mocks/featureToggles.ts

+3-102
Original file line numberDiff line numberDiff line change
@@ -1,108 +1,9 @@
11
// This must be a "factory" function so that the values are not resoved too early in dev server startup, before vite
2+
23
// has resolved the env variables.
34
export const featureTogglesFactory = () => [
45
{
5-
key: 'BRUK_V2_MELDINGER',
6-
value: process.env.VITE_BRUK_V2_MELDINGER,
7-
},
8-
{
9-
key: 'KLAGE_KABAL',
10-
value: process.env.VITE_KLAGE_KABAL,
11-
},
12-
{
13-
key: 'VARSELTEKST',
14-
value: process.env.VITE_VARSELTEKST,
15-
},
16-
{
17-
key: 'DOKUMENTDATA',
18-
value: process.env.VITE_DOKUMENTDATA,
19-
},
20-
{
21-
key: 'UNNTAKSBEHANDLING',
22-
value: process.env.VITE_UNNTAKSBEHANDLING,
23-
},
24-
{
25-
key: 'TYPE_MEDISINSKE_OPPLYSNINGER_BREV',
26-
value: process.env.VITE_TYPE_MEDISINSKE_OPPLYSNINGER_BREV,
27-
},
28-
{
29-
key: 'LOS_MARKER_BEHANDLING',
30-
value: process.env.VITE_LOS_MARKER_BEHANDLING,
31-
},
32-
{
33-
key: 'LOS_MARKER_BEHANDLING_SUBMIT',
34-
value: process.env.VITE_LOS_MARKER_BEHANDLING_SUBMIT,
35-
},
36-
{
37-
key: 'FRITEKST_REDIGERING',
38-
value: process.env.VITE_FRITEKST_REDIGERING,
39-
},
40-
{
41-
key: 'SKJUL_AVSLUTTET_ARBEIDSGIVER',
42-
value: process.env.VITE_SKJUL_AVSLUTTET_ARBEIDSGIVER,
43-
},
44-
{
45-
key: 'OMS_PUNSJSTRIPE',
46-
value: process.env.VITE_OMS_PUNSJSTRIPE,
47-
},
48-
{
49-
key: 'OMSORGEN_FOR_PERIODISERT',
50-
value: process.env.VITE_OMSORGEN_FOR_PERIODISERT,
51-
},
52-
{
53-
key: 'OVERSTYR_BEREGNING',
54-
value: process.env.VITE_OVERSTYR_BEREGNING,
55-
},
56-
{
57-
key: 'NYE_NOKKELTALL',
58-
value: process.env.VITE_NYE_NOKKELTALL,
59-
},
60-
{
61-
key: 'UTVIDET_VARSELFELT',
62-
value: process.env.VITE_UTVIDET_VARSELFELT,
63-
},
64-
{
65-
key: 'SKILL_UT_PRIVATPERSON',
66-
value: process.env.VITE_SKILL_UT_PRIVATPERSON,
67-
},
68-
{
69-
key: 'AUTOMATISK_VURDERT_MEDLEMSKAP',
70-
value: process.env.AUTOMATISK_VURDERT_MEDLEMSKAP,
71-
},
72-
{
73-
key: 'BRUK_V2_SAK_DOKUMENTER',
74-
value: process.env.VITE_BRUK_V2_SAK_DOKUMENTER,
75-
},
76-
{
77-
key: 'OPPTJENING_READ_ONLY_PERIODER',
78-
value: process.env.VITE_OPPTJENING_READ_ONLY_PERIODER,
79-
},
80-
{
81-
key: 'BRUK_INNTEKTSGRADERING_I_UTTAK',
82-
value: process.env.VITE_BRUK_INNTEKTSGRADERING_I_UTTAK,
83-
},
84-
{
85-
key: 'AKSJONSPUNKT_OVERLAPPENDE_SAKER',
86-
value: process.env.VITE_AKSJONSPUNKT_OVERLAPPENDE_SAKER,
87-
},
88-
{
89-
key: 'BRUK_V2_BEHANDLING_VELGER',
90-
value: process.env.VITE_BRUK_V2_BEHANDLING_VELGER,
91-
},
92-
{
93-
key: 'BRUK_V2_SAK_SOK',
94-
value: process.env.VITE_BRUK_V2_SAK_SOK,
95-
},
96-
{
97-
key: 'HISTORIKK_V2_VIS',
98-
value: process.env.VITE_HISTORIKK_V2_VIS,
99-
},
100-
{
101-
key: 'VIS_BEGRUNNELSE_FRA_BRUKER_I_KRONISK_SYK',
102-
value: process.env.VITE_VIS_BEGRUNNELSE_FRA_BRUKER_I_KRONISK_SYK,
103-
},
104-
{
105-
key: 'NY_INNTEKT_EGET_PANEL',
106-
value: process.env.VITE_NY_INNTEKT_EGET_PANEL,
6+
key: 'FEATURE_TOGGLES_ENV',
7+
value: process.env.VITE_FEATURE_TOGGLES_ENV,
1078
},
1089
];

‎deploy/dev-fss-k9saksbehandling.yml

+4-59
Original file line numberDiff line numberDiff line change
@@ -62,62 +62,7 @@ spec:
6262
- name: ENDRINGSLOGG_URL
6363
value: "https://familie-endringslogg.intern.dev.nav.no/"
6464

65-
# Feature-flag
66-
- name: KLAGE_KABAL
67-
value: "true"
68-
- name: VARSELTEKST
69-
value: "true"
70-
- name: DOKUMENTDATA
71-
value: "true"
72-
- name: UNNTAKSBEHANDLING
73-
value: "true"
74-
- name: KLAGEBEHANDLING
75-
value: "true"
76-
- name: TILBAKE
77-
value: "true"
78-
- name: TYPE_MEDISINSKE_OPPLYSNINGER_BREV
79-
value: "true"
80-
- name: LOS_MARKER_BEHANDLING
81-
value: "true"
82-
- name: LOS_MARKER_BEHANDLING_SUBMIT
83-
value: "true"
84-
- name: FRITEKST_REDIGERING
85-
value: "true"
86-
- name: INKLUDER_KALENDER_PILS
87-
value: "true"
88-
- name: SKJUL_AVSLUTTET_ARBEIDSGIVER
89-
value: "true"
90-
- name: OMS_PUNSJSTRIPE
91-
value: "true"
92-
- name: OMSORGEN_FOR_PERIODISERT
93-
value: "true"
94-
- name: OVERSTYR_BEREGNING
95-
value: "true"
96-
- name: "BRUK_V2_MELDINGER"
97-
value: "true"
98-
- name: NYE_NOKKELTALL
99-
value: "true"
100-
- name: UTVIDET_VARSELFELT
101-
value: "true"
102-
- name: SKILL_UT_PRIVATPERSON
103-
value: "true"
104-
- name: AUTOMATISK_VURDERT_MEDLEMSKAP
105-
value: "true"
106-
- name: BRUK_V2_SAK_DOKUMENTER
107-
value: "true"
108-
- name: OPPTJENING_READ_ONLY_PERIODER
109-
value: "true"
110-
- name: BRUK_INNTEKTSGRADERING_I_UTTAK
111-
value: "true"
112-
- name: AKSJONSPUNKT_OVERLAPPENDE_SAKER
113-
value: "true"
114-
- name: BRUK_V2_BEHANDLING_VELGER
115-
value: "true"
116-
- name: BRUK_V2_SAK_SOK
117-
value: "true"
118-
- name: HISTORIKK_V2_VIS
119-
value: "true"
120-
- name: VIS_BEGRUNNELSE_FRA_BRUKER_I_KRONISK_SYK
121-
value: "true"
122-
- name: NY_INNTEKT_EGET_PANEL
123-
value: "true"
65+
# Setter flagg som bestemmer hvilket sett med feature toggles som skal brukes i frontend.
66+
# Faktiske feature toggles for ulike miljø er satt i ulike filer i packages/v2/gui/src/featuretoggles
67+
- name: FEATURE_TOGGLES_ENV
68+
value: "k9-sak-q"

‎deploy/prod-fss-k9saksbehandling.yml

+4-59
Original file line numberDiff line numberDiff line change
@@ -59,62 +59,7 @@ spec:
5959
- name: ENDRINGSLOGG_URL
6060
value: 'https://familie-endringslogg.intern.nav.no/'
6161

62-
# Feature-flag
63-
- name: KLAGE_KABAL
64-
value: 'true'
65-
- name: VARSELTEKST
66-
value: 'true'
67-
- name: DOKUMENTDATA
68-
value: 'false'
69-
- name: UNNTAKSBEHANDLING
70-
value: 'false'
71-
- name: KLAGEBEHANDLING
72-
value: 'true'
73-
- name: TILBAKE
74-
value: 'true'
75-
- name: TYPE_MEDISINSKE_OPPLYSNINGER_BREV
76-
value: 'true'
77-
- name: LOS_MARKER_BEHANDLING
78-
value: 'true'
79-
- name: LOS_MARKER_BEHANDLING_SUBMIT
80-
value: 'false'
81-
- name: FRITEKST_REDIGERING
82-
value: 'true'
83-
- name: INKLUDER_KALENDER_PILS
84-
value: 'false'
85-
- name: SKJUL_AVSLUTTET_ARBEIDSGIVER
86-
value: 'false'
87-
- name: OMS_PUNSJSTRIPE
88-
value: 'true'
89-
- name: OMSORGEN_FOR_PERIODISERT
90-
value: 'true'
91-
- name: OVERSTYR_BEREGNING
92-
value: 'false'
93-
- name: BRUK_V2_MELDINGER
94-
value: 'true'
95-
- name: NYE_NOKKELTALL
96-
value: "false"
97-
- name: UTVIDET_VARSELFELT
98-
value: 'true'
99-
- name: SKILL_UT_PRIVATPERSON
100-
value: "true"
101-
- name: AUTOMATISK_VURDERT_MEDLEMSKAP
102-
value: "true"
103-
- name: "BRUK_V2_SAK_DOKUMENTER"
104-
value: "true"
105-
- name: OPPTJENING_READ_ONLY_PERIODER
106-
value: "true"
107-
- name: BRUK_INNTEKTSGRADERING_I_UTTAK
108-
value: "true"
109-
- name: AKSJONSPUNKT_OVERLAPPENDE_SAKER
110-
value: 'false'
111-
- name: BRUK_V2_BEHANDLING_VELGER
112-
value: 'false'
113-
- name: BRUK_V2_SAK_SOK
114-
value: 'false'
115-
- name: HISTORIKK_V2_VIS
116-
value: "true"
117-
- name: VIS_BEGRUNNELSE_FRA_BRUKER_I_KRONISK_SYK
118-
value: "true"
119-
- name: NY_INNTEKT_EGET_PANEL
120-
value: "false"
62+
# Setter flagg som bestemmer hvilket sett med feature toggles som skal brukes i frontend.
63+
# Faktiske feature toggles for ulike miljø er satt i ulike filer i packages/v2/gui/src/featuretoggles
64+
- name: FEATURE_TOGGLES_ENV
65+
value: 'k9-sak-prod'

‎deploy/ung/dev-gcp.yml

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
apiVersion: 'nais.io/v1alpha1'
2+
kind: 'Application'
3+
metadata:
4+
name: ung-sak-web
5+
namespace: k9saksbehandling
6+
labels:
7+
team: k9saksbehandling
8+
annotations:
9+
nais.io/run-as-user: '101' #nginx
10+
nais.io/read-only-file-system: 'false' #nginx
11+
nginx.ingress.kubernetes.io/proxy-buffer-size: '32k'
12+
nginx.ingress.kubernetes.io/proxy-read-timeout: '600'
13+
nginx.ingress.kubernetes.io/proxy-send-timeout: '600'
14+
spec:
15+
image: {{ image }}
16+
port: 9005
17+
liveness:
18+
path: /isAlive
19+
initialDelay: 10
20+
readiness:
21+
path: /isReady
22+
initialDelay: 10
23+
replicas:
24+
disableAutoScaling: true
25+
min: 2
26+
max: 2
27+
resources:
28+
requests:
29+
cpu: 200m
30+
memory: 32Mi
31+
limits:
32+
memory: 64Mi
33+
ingresses:
34+
- 'https://ung.intern.dev.nav.no'
35+
accessPolicy:
36+
outbound:
37+
rules:
38+
- application: ung-sak
39+
env:
40+
- name: APP_NAME
41+
value: ung-sak-web
42+
- name: APP_URL
43+
value: 'http://ung-sak'
44+
- name: APP_PORT
45+
value: '9005'
46+
47+
# Setter flagg som bestemmer hvilket sett med feature toggles som skal brukes i frontend.
48+
# Faktiske feature toggles for ulike miljø er satt i ulike filer i packages/v2/gui/src/featuretoggles
49+
- name: FEATURE_TOGGLES_ENV
50+
value: 'ung-sak-q'

0 commit comments

Comments
 (0)