From 08b59800682c2565a29fac4b7830d00ac05b2510 Mon Sep 17 00:00:00 2001 From: Anders Nomerstad Date: Wed, 3 Jul 2024 16:28:15 +0200 Subject: [PATCH 1/4] Setter namespace for tms-varsel-api access policy --- .nais/config.yml | 1 + .nais/vars/prod-next.yml | 2 +- .nais/vars/prod.yml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.nais/config.yml b/.nais/config.yml index afa2b782..8ccbc8b2 100644 --- a/.nais/config.yml +++ b/.nais/config.yml @@ -32,6 +32,7 @@ spec: - application: nav-dekoratoren-api - application: navno-search-api - application: tms-varsel-api + namespace: min-side external: {{#each outboundHosts as |host|}} - host: {{host}} diff --git a/.nais/vars/prod-next.yml b/.nais/vars/prod-next.yml index 71d83e51..f06f4f25 100644 --- a/.nais/vars/prod-next.yml +++ b/.nais/vars/prod-next.yml @@ -26,7 +26,7 @@ env: - name: LOGOUT_URL value: https://login.nav.no/oauth2/logout - name: VARSEL_API_URL - value: https://www.nav.no/tms-varsel-api + value: http://tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL diff --git a/.nais/vars/prod.yml b/.nais/vars/prod.yml index b989e385..bbf5e73d 100644 --- a/.nais/vars/prod.yml +++ b/.nais/vars/prod.yml @@ -27,7 +27,7 @@ env: - name: LOGOUT_URL value: https://login.nav.no/oauth2/logout - name: VARSEL_API_URL - value: https://www.nav.no/tms-varsel-api + value: http://tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL From de427d0f299946548ae3e2b12c76d2297f19e6f8 Mon Sep 17 00:00:00 2001 From: Anders Nomerstad Date: Wed, 3 Jul 2024 16:31:53 +0200 Subject: [PATCH 2/4] Skalerer ned k8s ressurser --- .nais/vars/prod-next.yml | 6 +++--- .nais/vars/prod.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.nais/vars/prod-next.yml b/.nais/vars/prod-next.yml index f06f4f25..1c8bce45 100644 --- a/.nais/vars/prod-next.yml +++ b/.nais/vars/prod-next.yml @@ -46,7 +46,7 @@ replicas: max: 40 resources: requests: - cpu: 1000m - memory: 512Mi + cpu: 200m + memory: 256Mi limits: - memory: 2048Mi + memory: 1024Mi diff --git a/.nais/vars/prod.yml b/.nais/vars/prod.yml index bbf5e73d..975a9772 100644 --- a/.nais/vars/prod.yml +++ b/.nais/vars/prod.yml @@ -47,7 +47,7 @@ replicas: max: 40 resources: requests: - cpu: 1000m + cpu: 500m memory: 512Mi limits: memory: 2048Mi From 494713d4eeae1772c635463350af9407c6cf3aa3 Mon Sep 17 00:00:00 2001 From: Anders Nomerstad Date: Wed, 3 Jul 2024 16:34:48 +0200 Subject: [PATCH 3/4] Setter root path for tms-varsel-api --- .nais/vars/dev-beta-navno.yml | 2 +- .nais/vars/dev-beta-tms.yml | 2 +- .nais/vars/dev-sandbox.yml | 2 +- .nais/vars/dev-stable.yml | 2 +- .nais/vars/prod-next.yml | 2 +- .nais/vars/prod.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.nais/vars/dev-beta-navno.yml b/.nais/vars/dev-beta-navno.yml index 1ece7eb3..7f74112f 100644 --- a/.nais/vars/dev-beta-navno.yml +++ b/.nais/vars/dev-beta-navno.yml @@ -28,7 +28,7 @@ env: - name: LOGOUT_URL value: https://login.ekstern.dev.nav.no/oauth2/logout - name: VARSEL_API_URL - value: http://tms-varsel-api + value: http://tms-varsel-api/tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL diff --git a/.nais/vars/dev-beta-tms.yml b/.nais/vars/dev-beta-tms.yml index 858c7436..54c9300c 100644 --- a/.nais/vars/dev-beta-tms.yml +++ b/.nais/vars/dev-beta-tms.yml @@ -27,7 +27,7 @@ env: - name: LOGOUT_URL value: https://login.ekstern.dev.nav.no/oauth2/logout - name: VARSEL_API_URL - value: http://tms-varsel-api + value: http://tms-varsel-api/tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL diff --git a/.nais/vars/dev-sandbox.yml b/.nais/vars/dev-sandbox.yml index e8276992..00316821 100644 --- a/.nais/vars/dev-sandbox.yml +++ b/.nais/vars/dev-sandbox.yml @@ -28,7 +28,7 @@ env: - name: LOGOUT_URL value: https://login.ekstern.dev.nav.no/oauth2/logout - name: VARSEL_API_URL - value: http://tms-varsel-api + value: http://tms-varsel-api/tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL diff --git a/.nais/vars/dev-stable.yml b/.nais/vars/dev-stable.yml index d2eabf94..f0ba06f9 100644 --- a/.nais/vars/dev-stable.yml +++ b/.nais/vars/dev-stable.yml @@ -29,7 +29,7 @@ env: - name: LOGOUT_URL value: https://login.ekstern.dev.nav.no/oauth2/logout - name: VARSEL_API_URL - value: http://tms-varsel-api + value: http://tms-varsel-api/tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL diff --git a/.nais/vars/prod-next.yml b/.nais/vars/prod-next.yml index 1c8bce45..2d936cc9 100644 --- a/.nais/vars/prod-next.yml +++ b/.nais/vars/prod-next.yml @@ -26,7 +26,7 @@ env: - name: LOGOUT_URL value: https://login.nav.no/oauth2/logout - name: VARSEL_API_URL - value: http://tms-varsel-api + value: http://tms-varsel-api/tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL diff --git a/.nais/vars/prod.yml b/.nais/vars/prod.yml index 975a9772..733c160e 100644 --- a/.nais/vars/prod.yml +++ b/.nais/vars/prod.yml @@ -27,7 +27,7 @@ env: - name: LOGOUT_URL value: https://login.nav.no/oauth2/logout - name: VARSEL_API_URL - value: http://tms-varsel-api + value: http://tms-varsel-api/tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL From 6c66e55b8a7ca39818993ea030cacb13ff75ea88 Mon Sep 17 00:00:00 2001 From: Anders Nomerstad Date: Wed, 3 Jul 2024 16:50:02 +0200 Subject: [PATCH 4/4] Namespace i service-hostname... --- .nais/vars/dev-beta-navno.yml | 2 +- .nais/vars/dev-beta-tms.yml | 2 +- .nais/vars/dev-sandbox.yml | 2 +- .nais/vars/dev-stable.yml | 2 +- .nais/vars/prod-next.yml | 2 +- .nais/vars/prod.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.nais/vars/dev-beta-navno.yml b/.nais/vars/dev-beta-navno.yml index 7f74112f..bee01636 100644 --- a/.nais/vars/dev-beta-navno.yml +++ b/.nais/vars/dev-beta-navno.yml @@ -28,7 +28,7 @@ env: - name: LOGOUT_URL value: https://login.ekstern.dev.nav.no/oauth2/logout - name: VARSEL_API_URL - value: http://tms-varsel-api/tms-varsel-api + value: http://tms-varsel-api.min-side/tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL diff --git a/.nais/vars/dev-beta-tms.yml b/.nais/vars/dev-beta-tms.yml index 54c9300c..a7ee9b91 100644 --- a/.nais/vars/dev-beta-tms.yml +++ b/.nais/vars/dev-beta-tms.yml @@ -27,7 +27,7 @@ env: - name: LOGOUT_URL value: https://login.ekstern.dev.nav.no/oauth2/logout - name: VARSEL_API_URL - value: http://tms-varsel-api/tms-varsel-api + value: http://tms-varsel-api.min-side/tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL diff --git a/.nais/vars/dev-sandbox.yml b/.nais/vars/dev-sandbox.yml index 00316821..d8494eec 100644 --- a/.nais/vars/dev-sandbox.yml +++ b/.nais/vars/dev-sandbox.yml @@ -28,7 +28,7 @@ env: - name: LOGOUT_URL value: https://login.ekstern.dev.nav.no/oauth2/logout - name: VARSEL_API_URL - value: http://tms-varsel-api/tms-varsel-api + value: http://tms-varsel-api.min-side/tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL diff --git a/.nais/vars/dev-stable.yml b/.nais/vars/dev-stable.yml index f0ba06f9..a03ab019 100644 --- a/.nais/vars/dev-stable.yml +++ b/.nais/vars/dev-stable.yml @@ -29,7 +29,7 @@ env: - name: LOGOUT_URL value: https://login.ekstern.dev.nav.no/oauth2/logout - name: VARSEL_API_URL - value: http://tms-varsel-api/tms-varsel-api + value: http://tms-varsel-api.min-side/tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL diff --git a/.nais/vars/prod-next.yml b/.nais/vars/prod-next.yml index 2d936cc9..fca3c32e 100644 --- a/.nais/vars/prod-next.yml +++ b/.nais/vars/prod-next.yml @@ -26,7 +26,7 @@ env: - name: LOGOUT_URL value: https://login.nav.no/oauth2/logout - name: VARSEL_API_URL - value: http://tms-varsel-api/tms-varsel-api + value: http://tms-varsel-api.min-side/tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL diff --git a/.nais/vars/prod.yml b/.nais/vars/prod.yml index 733c160e..53a49961 100644 --- a/.nais/vars/prod.yml +++ b/.nais/vars/prod.yml @@ -27,7 +27,7 @@ env: - name: LOGOUT_URL value: https://login.nav.no/oauth2/logout - name: VARSEL_API_URL - value: http://tms-varsel-api/tms-varsel-api + value: http://tms-varsel-api.min-side/tms-varsel-api - name: API_DEKORATOREN_URL value: http://nav-dekoratoren-api/person/nav-dekoratoren-api - name: API_SESSION_URL