Skip to content

Commit f92319e

Browse files
mrsladekmrsladek
authored
Forenkler bygg og release. Samme deploy oppsett. (#2132)
1 parent 91efb60 commit f92319e

10 files changed

+226
-294
lines changed

‎.deploy/dev-fss-teamforeldrepenger.json‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
{
2+
"environment": "dev",
3+
"serviceuserkv": "serviceuser/data/dev/srvfpabakus",
4+
"minReplicas": "1",
5+
"maxReplicas": "2",
6+
"limits": {
7+
"cpu": "2",
8+
"mem": "2048Mi"
9+
},
10+
"requests": {
11+
"cpu": "200m",
12+
"mem": "1024Mi"
13+
},
14+
"ingresses": [
15+
"https://fpabakus.nais.preprod.local",
16+
"https://fpabakus.dev.adeo.no",
17+
"https://fpabakus.dev.intern.nav.no",
18+
"https://fpabakus.dev-fss-pub.nais.io"
19+
],
20+
"env": {
21+
"APPD_ENABLED": "false",
22+
"SECURITYTOKENSERVICE_URL": "https://sts-q1.preprod.local/SecurityTokenServiceProvider/",
23+
"OIDC_OPEN_AM_WELL_KNOWN_URL": "https://isso-q.adeo.no:443/isso/oauth2/.well-known/openid-configuration",
24+
"OIDC_STS_WELL_KNOWN_URL": "https://security-token-service.nais.preprod.local/.well-known/openid-configuration",
25+
"ABAC_ATTRIBUTT_DRIFT": "no.nav.abac.attributter.resource.duplo.abakus.drift",
26+
"KAFKA_BOOTSTRAP_SERVERS": "b27apvl00045.preprod.local:8443,b27apvl00046.preprod.local:8443,b27apvl00047.preprod.local:8443",
27+
"KAFKA_SCHEMA_REGISTRY_URL": "https://kafka-test-schema-registry.nais.preprod.local",
28+
"KAFKA_FATTEVEDTAK_TOPIC": "privat-familie-vedtakFattet-v1-q1",
29+
"HENTINNTEKTLISTEBOLK_URL": "https://app-q1.adeo.no/inntektskomponenten-ws/rs/api/v1/hentinntektlistebolk",
30+
"AAREG_RS_URL": "http://aareg-services-nais-q1.arbeidsforhold/api/v1/arbeidstaker",
31+
"MELDEKORTUTBETALINGSGRUNNLAG_V1_URL": "https://arena-q1.adeo.no/ail_ws/MeldekortUtbetalingsgrunnlag_v1",
32+
"SIGRUNRESTBEREGNETSKATT_URL": "https://sigrun-q1.dev.adeo.no",
33+
"ORGANISASJON_RS_URL": "https://modapp-q1.adeo.no/ereg/api/v1/organisasjon",
34+
"FPABAKUS_IT_FP_GRUNNLAG_URL": "http://infotrygd-foreldrepenger.default/grunnlag",
35+
"FPABAKUS_IT_PS_GRUNNLAG_URL": "http://k9-infotrygd-grunnlag-paaroerende-sykdom.k9saksbehandling/paaroerendeSykdom/grunnlag",
36+
"FPABAKUS_IT_SP_GRUNNLAG_URL": "http://infotrygd-sykepenger-fp.default/grunnlag",
37+
"AZURE_HTTP_PROXY": "http://webproxy.nais:8088",
38+
"SPOKELSE_GRUNNLAG_SCOPES": "api://dev-fss.tbd.spokelse/.default",
39+
"SPOKELSE_GRUNNLAG_URL": "http://spokelse.tbd/grunnlag",
40+
"SKAL_INNENTE_YTELSE_ANVIST_ANDELER": "true"
41+
},
42+
"AZURE_IAC_RULES": [
43+
{
44+
"app": "fp-swagger",
45+
"namespace": "teamforeldrepenger",
46+
"cluster": "dev-gcp",
47+
"scopes": [
48+
"swagger"
49+
]
50+
},
51+
{
52+
"app": "fpsak",
53+
"namespace": "teamforeldrepenger",
54+
"cluster": "dev-fss"
55+
},
56+
{
57+
"app": "k9-sak",
58+
"namespace": "k9saksbehandling",
59+
"cluster": "dev-fss"
60+
}
61+
]
62+
}

‎.deploy/dev-fss-teamforeldrepenger.yaml‎

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

‎.deploy/naiserator.yaml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
kind: Application
2+
apiVersion: nais.io/v1alpha1
3+
metadata:
4+
name: fpabakus
5+
namespace: teamforeldrepenger
6+
labels:
7+
team: teamforeldrepenger
8+
spec:
9+
image: {{image}}
10+
port: 8080
11+
ingresses:
12+
{{#each ingresses as |url|}}
13+
- {{url}}
14+
{{/each}}
15+
liveness:
16+
path: "/fpabakus/internal/isAlive"
17+
initialDelay: 25
18+
timeout: 5
19+
periodSeconds: 10
20+
failureThreshold: 27
21+
readiness:
22+
path: "/fpabakus/internal/isReady"
23+
initialDelay: 25
24+
timeout: 5
25+
periodSeconds: 10
26+
failureThreshold: 27
27+
prometheus:
28+
enabled: true
29+
path: "/fpabakus/internal/metrics/prometheus"
30+
replicas:
31+
min: {{minReplicas}}
32+
max: {{maxReplicas}}
33+
cpuThresholdPercentage: 80
34+
preStopHookPath: "/fpabakus/internal/preStop"
35+
resources:
36+
limits:
37+
cpu: "{{limits.cpu}}"
38+
memory: "{{limits.mem}}"
39+
requests:
40+
cpu: "{{requests.cpu}}"
41+
memory: "{{requests.mem}}"
42+
secureLogs:
43+
enabled: true
44+
vault:
45+
enabled: true
46+
paths:
47+
- mountPath: /var/run/secrets/nais.io/serviceuser
48+
kvPath: {{serviceuserkv}}
49+
- mountPath: /var/run/secrets/nais.io/appdynamics
50+
kvPath: /apikey/appdynamics/{{environment}}
51+
env:
52+
{{#each env}}
53+
- name: {{@key}}
54+
value: "{{this}}"
55+
{{/each}}
56+
azure:
57+
application:
58+
enabled: true
59+
claims:
60+
extra:
61+
- "NAVident"
62+
- "azp_name"
63+
{{#if AZURE_IAC_RULES}}
64+
accessPolicy:
65+
inbound:
66+
rules:
67+
{{#each AZURE_IAC_RULES}}
68+
- application: {{app}}
69+
namespace: {{namespace}}
70+
cluster: {{cluster}}
71+
{{#if scopes}}
72+
permissions:
73+
scopes:
74+
{{#each scopes}}
75+
- "{{this}}"
76+
{{/each}}
77+
{{/if}}
78+
{{/each}}
79+
{{/if}}

‎.deploy/prod-fss-teamforeldrepenger.json‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"environment": "prod",
3+
"serviceuserkv": "serviceuser/data/prod/srvfpabakus",
4+
"minReplicas": "4",
5+
"maxReplicas": "6",
6+
"limits": {
7+
"cpu": "2",
8+
"mem": "2048Mi"
9+
},
10+
"requests": {
11+
"cpu": "500m",
12+
"mem": "1024Mi"
13+
},
14+
"ingresses": [
15+
"https://fpabakus.nais.adeo.no",
16+
"https://fpabakus.intern.nav.no",
17+
"https://fpabakus.prod-fss-pub.nais.io"
18+
],
19+
"env": {
20+
"APPD_ENABLED": "true",
21+
"SECURITYTOKENSERVICE_URL": "https://sts.adeo.no/SecurityTokenServiceProvider/",
22+
"OIDC_OPEN_AM_WELL_KNOWN_URL": "https://isso.adeo.no:443/isso/oauth2/.well-known/openid-configuration",
23+
"OIDC_STS_WELL_KNOWN_URL": "https://security-token-service.nais.adeo.no/.well-known/openid-configuration",
24+
"ABAC_ATTRIBUTT_DRIFT": "no.nav.abac.attributter.resource.duplo.abakus.drift",
25+
"KAFKA_BOOTSTRAP_SERVERS": "a01apvl00145.adeo.no:8443,a01apvl00146.adeo.no:8443,a01apvl00147.adeo.no:8443,a01apvl00148.adeo.no:8443,a01apvl00149.adeo.no:8443,a01apvl00150.adeo.no:8443",
26+
"KAFKA_SCHEMA_REGISTRY_URL": "http://kafka-schema-registry.tpa:8081",
27+
"KAFKA_FATTEVEDTAK_TOPIC": "privat-familie-vedtakFattet-v1",
28+
"HENTINNTEKTLISTEBOLK_URL": "https://app.adeo.no/inntektskomponenten-ws/rs/api/v1/hentinntektlistebolk",
29+
"AAREG_RS_URL": "http://aareg-services-nais.arbeidsforhold/api/v1/arbeidstaker",
30+
"MELDEKORTUTBETALINGSGRUNNLAG_V1_URL": "https://arena.adeo.no/ail_ws/MeldekortUtbetalingsgrunnlag_v1",
31+
"SIGRUNRESTBEREGNETSKATT_URL": "https://sigrun.nais.adeo.no",
32+
"ORGANISASJON_RS_URL": "https://modapp.adeo.no/ereg/api/v1/organisasjon",
33+
"FPABAKUS_IT_FP_GRUNNLAG_URL": "http://infotrygd-foreldrepenger.default/grunnlag",
34+
"FPABAKUS_IT_PS_GRUNNLAG_URL": "http://k9-infotrygd-grunnlag-paaroerende-sykdom.k9saksbehandling/paaroerendeSykdom/grunnlag",
35+
"FPABAKUS_IT_SP_GRUNNLAG_URL": "http://infotrygd-sykepenger-fp.default/grunnlag",
36+
"AZURE_HTTP_PROXY": "http://webproxy.nais:8088",
37+
"SPOKELSE_GRUNNLAG_SCOPES": "api://prod-fss.tbd.spokelse/.default",
38+
"SPOKELSE_GRUNNLAG_URL": "http://spokelse.tbd/grunnlag",
39+
"SKAL_INNENTE_YTELSE_ANVIST_ANDELER": "true"
40+
},
41+
"AZURE_IAC_RULES": [
42+
{
43+
"app": "fp-swagger",
44+
"namespace": "teamforeldrepenger",
45+
"cluster": "prod-gcp",
46+
"scopes": [
47+
"swagger"
48+
]
49+
},
50+
{
51+
"app": "fpsak",
52+
"namespace": "teamforeldrepenger",
53+
"cluster": "prod-fss"
54+
}
55+
]
56+
}

0 commit comments

Comments
 (0)