Skip to content
This repository was archived by the owner on Apr 21, 2023. It is now read-only.

Commit 529da50

Browse files
committed
Disabler automatisk workflow + reverter naiserator endringer
1 parent a900e34 commit 529da50

File tree

5 files changed

+37
-32
lines changed

5 files changed

+37
-32
lines changed

.deploy/dev-gcp-teamforeldrepenger.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dekoratoren": "dekoratoren.dev.nav.no",
3-
"ingresses": ["https://foreldrepengeplanlegger.dev.nav.no"],
3+
"ingresses_NB_FJERN_FRA_FORELDREPENGER_INNGANG": ["https://foreldrepengeplanlegger.dev.nav.no"],
44
"env": {
55
"APPRES_CMS_URL": "https://dekoratoren.dev.nav.no",
66
"FP_UTTAK_SERVICE_URL": "https://foreldrepengesoknad-api.dev.nav.no"

.deploy/naiserator.yaml

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,39 @@ metadata:
55
namespace: teamforeldrepenger
66
labels:
77
team: teamforeldrepenger
8-
annotations:
9-
nginx.ingress.kubernetes.io/configuration-snippet: |
10-
rewrite ^/.* https://www.nav.no/foreldrepenger#hvor-lenge;
118
spec:
9+
accessPolicy:
10+
outbound:
11+
external:
12+
- host: {{dekoratoren}}
13+
image: {{image}}
14+
port: 8080
15+
replicas:
16+
min: 2
17+
max: 2
18+
disableAutoScaling: true
19+
liveness:
20+
path: /health/isAlive
21+
initialDelay: 60
22+
readiness:
23+
path: /health/isReady
24+
initialDelay: 60
25+
prometheus:
26+
enabled: false
27+
path: /internal/actuator/prometheus
1228
ingresses:
13-
{{#each ingresses as |url|}}
14-
- {{url}}
15-
{{/each}}
29+
{{#each ingresses as |url|}}
30+
- {{url}}
31+
{{/each}}
32+
resources:
33+
limits:
34+
cpu: 500m
35+
memory: 512Mi
36+
requests:
37+
cpu: 200m
38+
memory: 256Mi
39+
env:
40+
{{#each env}}
41+
- name: {{@key}}
42+
value: "{{this}}"
43+
{{/each}}

.deploy/prod-gcp-teamforeldrepenger.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dekoratoren": "www.nav.no",
3-
"ingresses": ["https://foreldrepengeplanlegger.intern.nav.no", "https://foreldrepengeplanlegger.nav.no"],
3+
"ingresses_NB_FJERN_FRA_FORELDREPENGER_INNGANG": ["https://foreldrepengeplanlegger.intern.nav.no", "https://foreldrepengeplanlegger.nav.no"],
44
"env": {
55
"APPRES_CMS_URL": "https://www.nav.no/dekoratoren",
66
"FP_UTTAK_SERVICE_URL": "https://foreldrepengesoknad-api.nav.no"

.github/workflows/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ name: Deployment pipeline q1
55
# branches:
66
# - master
77

8+
# gjør denne manuell
89
on:
910
workflow_dispatch:
1011

.github/workflows/manuell_deploy_dev.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)