From d0fb4eb553a21237981c5b2979b8846540db6a89 Mon Sep 17 00:00:00 2001 From: vebnor Date: Wed, 11 Dec 2024 18:42:32 +0100 Subject: [PATCH 01/25] bytte db-config --- nais/dev-gcp.yml | 8 -------- src/main/resources/application.yml | 7 +++---- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 1b3291e2a..9a3332c6d 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -71,14 +71,6 @@ spec: envFrom: - secret: k9-punsj-secrets env: - - name: DEFAULTDS_USERNAME - value: k9-punsj - - name: DEFAULTDS_PASSWORD - value: k9-punsj - - name: DEFAULTDS_VAULT_MOUNTPATH - value: postgresql/preprod-fss/ - - name: DEFAULTDS_URL - value: jdbc:postgresql://b27dbvl028.preprod.local:5432/k9-punsj - name: SWAGGER_SERVER_BASE_URL value: https://k9-punsj.dev.intern.nav.no diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d8987018a..804584fbb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -76,10 +76,9 @@ no.nav: proxyUrl: ${HTTP_PROXY:} db: - url: ${DEFAULTDS_URL} - username: ${DEFAULTDS_USERNAME} - password: ${DEFAULTDS_PASSWORD} - vault_mountpath: ${DEFAULTDS_VAULT_MOUNTPATH} + url: ${DB_URL} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} abac: system_user: ${SYSTEMBRUKER_USERNAME} From 60d231916674842dba7cf4decc5471da9e1f64d8 Mon Sep 17 00:00:00 2001 From: vebnor Date: Wed, 11 Dec 2024 18:45:44 +0100 Subject: [PATCH 02/25] db env var prefix --- nais/dev-gcp.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 9a3332c6d..b1695d6e3 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -59,6 +59,9 @@ spec: tier: db-f1-micro databases: - name: k9-punsj + envVarPrefix: DB + + observability: autoInstrumentation: enabled: true From 2c20e4bd195747b7132afa72b00dafb0a182e324 Mon Sep 17 00:00:00 2001 From: vebnor Date: Wed, 11 Dec 2024 18:55:04 +0100 Subject: [PATCH 03/25] fikse config for tester --- nais/dev-gcp.yml | 2 -- src/test/kotlin/no/nav/k9punsj/MockConfiguration.kt | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index b1695d6e3..5a0bbe159 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -60,8 +60,6 @@ spec: databases: - name: k9-punsj envVarPrefix: DB - - observability: autoInstrumentation: enabled: true diff --git a/src/test/kotlin/no/nav/k9punsj/MockConfiguration.kt b/src/test/kotlin/no/nav/k9punsj/MockConfiguration.kt index f36c1508f..1dfe52ee3 100644 --- a/src/test/kotlin/no/nav/k9punsj/MockConfiguration.kt +++ b/src/test/kotlin/no/nav/k9punsj/MockConfiguration.kt @@ -50,9 +50,9 @@ internal object MockConfiguration { "SWAGGER_SERVER_BASE_URL" to "http://localhost:$port", "KAFKA_BOOTSTRAP_SERVERS" to "localhost:9093", "DEFAULTDS_VAULT_MOUNTPATH" to "", - "DEFAULTDS_URL" to "${postgresqlContainer?.jdbcUrl}", - "DEFAULTDS_USERNAME" to "${postgresqlContainer?.username}", - "DEFAULTDS_PASSWORD" to "${postgresqlContainer?.password}", + "DB_URL" to "${postgresqlContainer?.jdbcUrl}", + "DB_USERNAME" to "${postgresqlContainer?.username}", + "DB_PASSWORD" to "${postgresqlContainer?.password}", "NAIS_STS_TOKEN_ENDPOINT" to wireMockServer.getNaisStsTokenUrl(), "AUDITLOGGER_ENABLED" to "false", "ABAC_PDP_ENDPOINT_URL" to "", From ae2dfd6380e2adddecb8189c282a3b64bc4ff35d Mon Sep 17 00:00:00 2001 From: vebnor Date: Wed, 11 Dec 2024 19:00:42 +0100 Subject: [PATCH 04/25] fikse config for tester --- src/main/resources/application.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 804584fbb..2380eb0a4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -79,6 +79,7 @@ no.nav: url: ${DB_URL} username: ${DB_USERNAME} password: ${DB_PASSWORD} + vault_mountpath: ${DEFAULTDS_VAULT_MOUNTPATH} abac: system_user: ${SYSTEMBRUKER_USERNAME} From 605d44757462b5f85c634a74c85ff363c4cb80eb Mon Sep 17 00:00:00 2001 From: vebnor Date: Wed, 11 Dec 2024 19:15:28 +0100 Subject: [PATCH 05/25] gi tom verdi til vault_mountpath, kanskje det hjelper --- src/main/kotlin/no/nav/k9punsj/configuration/DbConfiguration.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/no/nav/k9punsj/configuration/DbConfiguration.kt b/src/main/kotlin/no/nav/k9punsj/configuration/DbConfiguration.kt index 63051ac09..4c8bf75b0 100644 --- a/src/main/kotlin/no/nav/k9punsj/configuration/DbConfiguration.kt +++ b/src/main/kotlin/no/nav/k9punsj/configuration/DbConfiguration.kt @@ -10,7 +10,7 @@ class DbConfiguration( @Value("\${no.nav.db.url}") private val url: String, @Value("\${no.nav.db.username}") private val username: String, @Value("\${no.nav.db.password}") private val password: String?, - @Value("\${no.nav.db.vault_mountpath}") private val vaultMountpath: String + @Value("\${no.nav.db.vault_mountpath:}") private val vaultMountpath: String ) { @Bean From 79c4c355d3a82642d2da912da5d0fce9c0f6e47d Mon Sep 17 00:00:00 2001 From: vebnor Date: Wed, 11 Dec 2024 19:16:36 +0100 Subject: [PATCH 06/25] =?UTF-8?q?pr=C3=B8ve=20=C3=A5=20fikse=20deploy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/no/nav/k9punsj/configuration/DbConfiguration.kt | 2 +- src/main/resources/application.yml | 4 ++-- src/test/kotlin/no/nav/k9punsj/MockConfiguration.kt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/no/nav/k9punsj/configuration/DbConfiguration.kt b/src/main/kotlin/no/nav/k9punsj/configuration/DbConfiguration.kt index 4c8bf75b0..63051ac09 100644 --- a/src/main/kotlin/no/nav/k9punsj/configuration/DbConfiguration.kt +++ b/src/main/kotlin/no/nav/k9punsj/configuration/DbConfiguration.kt @@ -10,7 +10,7 @@ class DbConfiguration( @Value("\${no.nav.db.url}") private val url: String, @Value("\${no.nav.db.username}") private val username: String, @Value("\${no.nav.db.password}") private val password: String?, - @Value("\${no.nav.db.vault_mountpath:}") private val vaultMountpath: String + @Value("\${no.nav.db.vault_mountpath}") private val vaultMountpath: String ) { @Bean diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2380eb0a4..6598e7340 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -76,10 +76,10 @@ no.nav: proxyUrl: ${HTTP_PROXY:} db: - url: ${DB_URL} + url: ${DB_JDBC_URL} username: ${DB_USERNAME} password: ${DB_PASSWORD} - vault_mountpath: ${DEFAULTDS_VAULT_MOUNTPATH} + vault_mountpath: "" abac: system_user: ${SYSTEMBRUKER_USERNAME} diff --git a/src/test/kotlin/no/nav/k9punsj/MockConfiguration.kt b/src/test/kotlin/no/nav/k9punsj/MockConfiguration.kt index 1dfe52ee3..6e3d41973 100644 --- a/src/test/kotlin/no/nav/k9punsj/MockConfiguration.kt +++ b/src/test/kotlin/no/nav/k9punsj/MockConfiguration.kt @@ -50,7 +50,7 @@ internal object MockConfiguration { "SWAGGER_SERVER_BASE_URL" to "http://localhost:$port", "KAFKA_BOOTSTRAP_SERVERS" to "localhost:9093", "DEFAULTDS_VAULT_MOUNTPATH" to "", - "DB_URL" to "${postgresqlContainer?.jdbcUrl}", + "DB_JDBC_URL" to "${postgresqlContainer?.jdbcUrl}", "DB_USERNAME" to "${postgresqlContainer?.username}", "DB_PASSWORD" to "${postgresqlContainer?.password}", "NAIS_STS_TOKEN_ENDPOINT" to wireMockServer.getNaisStsTokenUrl(), From c40cda7cfe5ca5b81d73cae89a75c58db4fe649d Mon Sep 17 00:00:00 2001 From: vebnor Date: Wed, 11 Dec 2024 19:29:57 +0100 Subject: [PATCH 07/25] go agane :-) --- nais/dev-gcp.yml | 2 ++ src/main/resources/application.yml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 5a0bbe159..0e6dd0df2 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -74,6 +74,8 @@ spec: env: - name: SWAGGER_SERVER_BASE_URL value: https://k9-punsj.dev.intern.nav.no + - name: DEFAULTDS_VAULT_MOUNTPATH + value: "" # SAF: - name: SAF_BASE_URL diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6598e7340..2380eb0a4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -76,10 +76,10 @@ no.nav: proxyUrl: ${HTTP_PROXY:} db: - url: ${DB_JDBC_URL} + url: ${DB_URL} username: ${DB_USERNAME} password: ${DB_PASSWORD} - vault_mountpath: "" + vault_mountpath: ${DEFAULTDS_VAULT_MOUNTPATH} abac: system_user: ${SYSTEMBRUKER_USERNAME} From fedff4d875a6989431552c54f53f33d7f7ff7f89 Mon Sep 17 00:00:00 2001 From: vebnor Date: Wed, 11 Dec 2024 19:31:44 +0100 Subject: [PATCH 08/25] Revert "go agane :-)" This reverts commit c40cda7cfe5ca5b81d73cae89a75c58db4fe649d. --- nais/dev-gcp.yml | 2 -- src/main/resources/application.yml | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 0e6dd0df2..5a0bbe159 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -74,8 +74,6 @@ spec: env: - name: SWAGGER_SERVER_BASE_URL value: https://k9-punsj.dev.intern.nav.no - - name: DEFAULTDS_VAULT_MOUNTPATH - value: "" # SAF: - name: SAF_BASE_URL diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2380eb0a4..6598e7340 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -76,10 +76,10 @@ no.nav: proxyUrl: ${HTTP_PROXY:} db: - url: ${DB_URL} + url: ${DB_JDBC_URL} username: ${DB_USERNAME} password: ${DB_PASSWORD} - vault_mountpath: ${DEFAULTDS_VAULT_MOUNTPATH} + vault_mountpath: "" abac: system_user: ${SYSTEMBRUKER_USERNAME} From 2bdb7d69ac35ffca01f037248c0a06bb90d7ffa1 Mon Sep 17 00:00:00 2001 From: vebnor Date: Wed, 11 Dec 2024 19:34:11 +0100 Subject: [PATCH 09/25] trenger vi denne? --- src/main/resources/application.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6598e7340..ee1358ff6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,8 +1,6 @@ spring: flyway: enabled: true - init-sqls: - - SET ROLE "k9-punsj-admin" management: health: From 5c843d6f88000a0f051f8bff7f89c9a6c30d72d5 Mon Sep 17 00:00:00 2001 From: vebnor Date: Fri, 13 Dec 2024 09:30:50 +0100 Subject: [PATCH 10/25] Bytte til GCP-eksponerte URLer --- nais/dev-gcp.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 5a0bbe159..12fae8b17 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -26,9 +26,9 @@ spec: inbound: rules: - application: k9-punsj-frontend - namespace: k9saksbehandling - cluster: dev-gcp - application: k9-sak + namespace: k9saksbehandling + cluster: dev-fss liveness: path: /internal/actuator/info initialDelay: 20 @@ -77,7 +77,7 @@ spec: # SAF: - name: SAF_BASE_URL - value: https://saf.dev.intern.nav.no + value: https://saf-q2.dev-fss-pub.nais.io - name: SAF_HENTE_JOURNALPOST_SCOPES value: api://dev-fss.teamdokumenthandtering.saf/.default - name: SAF_HENTE_DOKUMENT_SCOPES @@ -85,19 +85,19 @@ spec: # Gosys / Oppgave: - name: GOSYS_BASE_URL - value: http://oppgave.oppgavehandtering + value: https://oppgave.dev-fss-pub.nais.io - name: GOSYS_BASE_SCOPE value: api://dev-fss.oppgavehandtering.oppgave/.default # PDL: - name: PDL_BASE_URL - value: https://pdl-api.dev.intern.nav.no/graphql + value: https://pdl-api.dev-fss-pub.nais.io/graphql - name: PDL_SCOPE value: api://dev-fss.pdl.pdl-api/.default # Sikkerhet: - name: ABAC_PDP_ENDPOINT_URL - value: http://abac-k9.k9saksbehandling/application/authorize + value: https://abac-k9.dev-fss-pub.nais.io/application/authorize # Audit logging - name: AUDITLOGGER_ENABLED @@ -113,17 +113,17 @@ spec: # Integrasjoner (Rest) - name: K9SAK_BASE_URL - value: https://k9-sak.nais.preprod.local/k9/sak/api + value: https://k9-sak.dev-fss-pub.nais.io/k9/sak/api - name: K9SAK_SCOPE value: api://dev-fss.k9saksbehandling.k9-sak/.default - name: AAREG_BASE_URL - value: https://aareg-services.intern.dev.nav.no/api/v2 + value: https://aareg-services.dev-fss-pub.nais.io/api/v2 - name: AAREG_SCOPE value: api://dev-fss.arbeidsforhold.aareg-services-nais/.default - name: EREG_BASE_URL - value: https://ereg-services.intern.dev.nav.no/api/v1 + value: https://ereg-services-q2.dev-fss-pub.nais.io//api/v1 - name: DOKARKIV_BASE_URL - value: https://dokarkiv.dev.intern.nav.no + value: https://dokarkiv-q2.dev-fss-pub.nais.io - name: DOKARKIV_SCOPE value: api://dev-fss.teamdokumenthandtering.dokarkiv/.default From c892899769bf84327eb71faa5b16ffdc96877fd5 Mon Sep 17 00:00:00 2001 From: vebnor Date: Fri, 13 Dec 2024 12:16:54 +0100 Subject: [PATCH 11/25] =?UTF-8?q?st=C3=B8tte=20b=C3=A5de=20fss=20og=20gcp?= =?UTF-8?q?=20env=20vars=20for=20db?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ee1358ff6..2d8f456b9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -74,10 +74,10 @@ no.nav: proxyUrl: ${HTTP_PROXY:} db: - url: ${DB_JDBC_URL} - username: ${DB_USERNAME} - password: ${DB_PASSWORD} - vault_mountpath: "" + url: ${DEFAULTDS_URL:${DB_JDBC_URL}} + username: ${DEFAULTDS_USERNAME:${DB_USERNAME}} + password: ${DEFAULTDS_PASSWORD:${DB_PASSWORD}} + vault_mountpath: ${DB_VAULT_MOUNT_PATH:""} abac: system_user: ${SYSTEMBRUKER_USERNAME} From 293af39beff879739e00e6580b2a406b220c163e Mon Sep 17 00:00:00 2001 From: vebnor Date: Wed, 18 Dec 2024 15:01:21 +0100 Subject: [PATCH 12/25] fiks --- nais/dev-gcp.yml | 2 +- src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 12fae8b17..4927ba362 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -117,7 +117,7 @@ spec: - name: K9SAK_SCOPE value: api://dev-fss.k9saksbehandling.k9-sak/.default - name: AAREG_BASE_URL - value: https://aareg-services.dev-fss-pub.nais.io/api/v2 + value: https://aareg-services-q2.dev-fss-pub.nais.io/api/v2 - name: AAREG_SCOPE value: api://dev-fss.arbeidsforhold.aareg-services-nais/.default - name: EREG_BASE_URL diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2d8f456b9..0198f5985 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -77,7 +77,7 @@ no.nav: url: ${DEFAULTDS_URL:${DB_JDBC_URL}} username: ${DEFAULTDS_USERNAME:${DB_USERNAME}} password: ${DEFAULTDS_PASSWORD:${DB_PASSWORD}} - vault_mountpath: ${DB_VAULT_MOUNT_PATH:""} + vault_mountpath: ${DB_VAULT_MOUNT_PATH:} abac: system_user: ${SYSTEMBRUKER_USERNAME} From cfcc05e3c82c683242ee82fa2229c03ceec1b243 Mon Sep 17 00:00:00 2001 From: vebnor Date: Mon, 23 Dec 2024 09:49:36 +0100 Subject: [PATCH 13/25] flytte ingressen til gcp-appen --- nais/dev-fss.yml | 3 --- nais/dev-gcp.yml | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nais/dev-fss.yml b/nais/dev-fss.yml index 2ef62caf6..dcbc6dd9b 100644 --- a/nais/dev-fss.yml +++ b/nais/dev-fss.yml @@ -46,9 +46,6 @@ spec: requests: cpu: 200m memory: 512Mi - ingresses: - - https://k9-punsj.dev.intern.nav.no - - https://k9-punsj.dev-fss-pub.nais.io replicas: min: 1 max: 1 diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 4927ba362..7172153b4 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -39,6 +39,8 @@ spec: path: /internal/actuator/info initialDelay: 20 timeout: 1 + ingresses: + - https://k9-punsj.dev.intern.nav.no resources: limits: cpu: 2000m From b05f070a87d595039bf0072afd3ab5f1280ddfdf Mon Sep 17 00:00:00 2001 From: vebnor Date: Mon, 23 Dec 2024 09:52:08 +0100 Subject: [PATCH 14/25] fjerne dev-fss workflow --- .../workflows/build-master-deploy-dev.yaml | 67 ------------------- 1 file changed, 67 deletions(-) delete mode 100644 .github/workflows/build-master-deploy-dev.yaml diff --git a/.github/workflows/build-master-deploy-dev.yaml b/.github/workflows/build-master-deploy-dev.yaml deleted file mode 100644 index 7d71c1905..000000000 --- a/.github/workflows/build-master-deploy-dev.yaml +++ /dev/null @@ -1,67 +0,0 @@ -name: Build master & deploy to dev - -on: - push: - branches: - - master - paths-ignore: - - '**.md' - - '**.MD' - - '.gitignore' - - 'LICENSE' - - 'CODEOWNERS' - - 'docs/**' - - 'kafka/**' - workflow_dispatch: - -env: - IMAGE_BASE: ghcr.io/${{ github.repository }} - -jobs: - Build: - runs-on: ubuntu-latest - permissions: - contents: write # dep submissions - id-token: write # nais docker-build-push - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - java-version: 21 - distribution: temurin - cache: maven - - - name: Bygge JAR - run: mvn clean package --settings ./.m2/settings.xml - env: - GITHUB_PASSWORD: ${{ secrets.READER_TOKEN }} - - - uses: nais/docker-build-push@v0 - id: docker-push - with: - team: k9saksbehandling - push_image: true - tag: latest - pull: true - dockerfile: Dockerfile - docker_context: . - project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} - identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} - - - name: Deploy til preprod - uses: nais/deploy/actions/deploy@v2 - env: - APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }} - CLUSTER: dev-fss - RESOURCE: nais/dev-fss.yml - IMAGE: ${{ steps.docker-push.outputs.image }} - - - name: Maven Dependency Tree Dependency Submission - uses: advanced-security/maven-dependency-submission-action@v4.1.1 # feil i 4.0.1 - with: - settings-file: ./.m2/settings.xml - ignore-maven-wrapper: true - env: - GITHUB_USERNAME: x-access-token - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_PASSWORD: ${{ secrets.READER_TOKEN }} From b0c61451e8284435fe312f251bc42bc3f42e6faf Mon Sep 17 00:00:00 2001 From: vebnor Date: Mon, 23 Dec 2024 09:58:02 +0100 Subject: [PATCH 15/25] ny ingress --- nais/dev-gcp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 7172153b4..64c5864cc 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -40,7 +40,7 @@ spec: initialDelay: 20 timeout: 1 ingresses: - - https://k9-punsj.dev.intern.nav.no + - https://k9-punsj.intern.dev.nav.no resources: limits: cpu: 2000m From be1dce30d55b653f7686123f406e64c5a1a462cc Mon Sep 17 00:00:00 2001 From: vebnor Date: Mon, 23 Dec 2024 11:11:16 +0100 Subject: [PATCH 16/25] reply url --- nais/dev-gcp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 64c5864cc..163faae00 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -21,7 +21,7 @@ spec: - id: "0bc9661c-975c-4adb-86d1-a97172490662" singlePageApplication: true replyURLs: - - https://k9-punsj.dev.intern.nav.no/internal/webjars/swagger-ui/oauth2-redirect.html + - https://k9-punsj.intern.dev.nav.no/internal/webjars/swagger-ui/oauth2-redirect.html accessPolicy: inbound: rules: From 18b39f704b8c4fdf3000af0eea174bea632a890c Mon Sep 17 00:00:00 2001 From: vebnor Date: Mon, 23 Dec 2024 11:25:35 +0100 Subject: [PATCH 17/25] swagger url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 18b5240c8..088b1bf2e 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ Link til k9-punsj skjemaer: ### Swagger i dev Bruk header fra Nav token header i authorize. -[Swagger](https://k9-punsj.dev.intern.nav.no/internal/webjars/swagger-ui/index.html?configUrl=/internal/api-docs/swagger-config) +[Swagger](https://k9-punsj.intern.dev.nav.no/internal/webjars/swagger-ui/index.html?configUrl=/internal/api-docs/swagger-config) ### Accesstoken i dev Husk å være logget inn på [dev](https://k9-punsj-frontend.intern.dev.nav.no/) først, så gå til From 3e883cfd46423f5d4bf9752011a8f7d62abe5877 Mon Sep 17 00:00:00 2001 From: vebnor Date: Mon, 23 Dec 2024 11:36:19 +0100 Subject: [PATCH 18/25] =?UTF-8?q?pr=C3=B8ver=20=C3=A5=20v=C3=A6re=20ekspli?= =?UTF-8?q?sitt=20i=20inbound-rules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nais/dev-gcp.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 163faae00..9da602b7e 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -26,6 +26,8 @@ spec: inbound: rules: - application: k9-punsj-frontend + namespace: k9saksbehandling + cluster: dev-gcp - application: k9-sak namespace: k9saksbehandling cluster: dev-fss From 6dc79d405e15f21ceb7b1c004661030248d508b2 Mon Sep 17 00:00:00 2001 From: vebnor Date: Mon, 23 Dec 2024 12:21:19 +0100 Subject: [PATCH 19/25] access policy --- nais/dev-gcp.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 9da602b7e..163faae00 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -26,8 +26,6 @@ spec: inbound: rules: - application: k9-punsj-frontend - namespace: k9saksbehandling - cluster: dev-gcp - application: k9-sak namespace: k9saksbehandling cluster: dev-fss From 72a913380169bbf791b36f53def4ed27b33ac2c5 Mon Sep 17 00:00:00 2001 From: vebnor Date: Mon, 23 Dec 2024 12:33:37 +0100 Subject: [PATCH 20/25] fjerne webproxy --- nais/dev-gcp.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 163faae00..31a931b3b 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -68,7 +68,6 @@ spec: runtime: java destinations: - id: "grafana-lgtm" - webproxy: true kafka: pool: nav-dev envFrom: From c4715fd86b655d8ed128e7b49ba63eb650de0753 Mon Sep 17 00:00:00 2001 From: vebnor Date: Mon, 23 Dec 2024 13:07:15 +0100 Subject: [PATCH 21/25] outbound access policy --- nais/dev-gcp.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 31a931b3b..358abdd6c 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -29,6 +29,17 @@ spec: - application: k9-sak namespace: k9saksbehandling cluster: dev-fss + outbound: + external: + - host: "https://saf-q2.dev-fss-pub.nais.io" + - host: "https://oppgave.dev-fss-pub.nais.io" + - host: "https://pdl-api.dev-fss-pub.nais.io" + - host: "https://abac-k9.dev-fss-pub.nais.io" + - host: "https://k9-sak.dev-fss-pub.nais.io" + - host: "https://aareg-services-q2.dev-fss-pub.nais.io" + - host: "https://ereg-services-q2.dev-fss-pub.nais.io" + - host: "https://dokarkiv-q2.dev-fss-pub.nais.io" + liveness: path: /internal/actuator/info initialDelay: 20 From f39b902ab221f07b4642cba9124f0c001d322c59 Mon Sep 17 00:00:00 2001 From: vebnor Date: Mon, 23 Dec 2024 13:16:41 +0100 Subject: [PATCH 22/25] outbound traffic --- nais/dev-gcp.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index 358abdd6c..e175f61f8 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -31,14 +31,14 @@ spec: cluster: dev-fss outbound: external: - - host: "https://saf-q2.dev-fss-pub.nais.io" - - host: "https://oppgave.dev-fss-pub.nais.io" - - host: "https://pdl-api.dev-fss-pub.nais.io" - - host: "https://abac-k9.dev-fss-pub.nais.io" - - host: "https://k9-sak.dev-fss-pub.nais.io" - - host: "https://aareg-services-q2.dev-fss-pub.nais.io" - - host: "https://ereg-services-q2.dev-fss-pub.nais.io" - - host: "https://dokarkiv-q2.dev-fss-pub.nais.io" + - host: "saf-q2.dev-fss-pub.nais.io" + - host: "oppgave.dev-fss-pub.nais.io" + - host: "pdl-api.dev-fss-pub.nais.io" + - host: "abac-k9.dev-fss-pub.nais.io" + - host: "k9-sak.dev-fss-pub.nais.io" + - host: "aareg-services-q2.dev-fss-pub.nais.io" + - host: "ereg-services-q2.dev-fss-pub.nais.io" + - host: "dokarkiv-q2.dev-fss-pub.nais.io" liveness: path: /internal/actuator/info From 0f4ab27a091170e78a647640600548ea98c00ed3 Mon Sep 17 00:00:00 2001 From: vebnor Date: Fri, 3 Jan 2025 16:28:31 +0100 Subject: [PATCH 23/25] skipper tester --- src/test/kotlin/no/nav/k9punsj/felles/PeriodeDtoTest.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/test/kotlin/no/nav/k9punsj/felles/PeriodeDtoTest.kt b/src/test/kotlin/no/nav/k9punsj/felles/PeriodeDtoTest.kt index 59d4764a7..0d89dd246 100644 --- a/src/test/kotlin/no/nav/k9punsj/felles/PeriodeDtoTest.kt +++ b/src/test/kotlin/no/nav/k9punsj/felles/PeriodeDtoTest.kt @@ -3,9 +3,11 @@ package no.nav.k9punsj.felles import no.nav.k9punsj.felles.dto.PeriodeDto import no.nav.k9punsj.omsorgspengeraleneomsorg.utledDato import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import java.time.LocalDate +@Disabled("Baluba etter nyttår") class PeriodeDtoTest { @Test From f88b52d2b54b34ea0565f0ebf4e508a0ed76db06 Mon Sep 17 00:00:00 2001 From: vebnor Date: Tue, 7 Jan 2025 11:25:35 +0100 Subject: [PATCH 24/25] fjerne disabling av test --- src/test/kotlin/no/nav/k9punsj/felles/PeriodeDtoTest.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/kotlin/no/nav/k9punsj/felles/PeriodeDtoTest.kt b/src/test/kotlin/no/nav/k9punsj/felles/PeriodeDtoTest.kt index 53d1cc8f6..158c88747 100644 --- a/src/test/kotlin/no/nav/k9punsj/felles/PeriodeDtoTest.kt +++ b/src/test/kotlin/no/nav/k9punsj/felles/PeriodeDtoTest.kt @@ -7,7 +7,6 @@ import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import java.time.LocalDate -@Disabled("Baluba etter nyttår") class PeriodeDtoTest { @Test From 197dec2e7272ac31345cf6997fdb77ae85f20cad Mon Sep 17 00:00:00 2001 From: vebnor Date: Tue, 7 Jan 2025 11:26:58 +0100 Subject: [PATCH 25/25] =?UTF-8?q?fjerne=20overfl=C3=B8dig=20/?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nais/dev-gcp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nais/dev-gcp.yml b/nais/dev-gcp.yml index e175f61f8..481cab79c 100644 --- a/nais/dev-gcp.yml +++ b/nais/dev-gcp.yml @@ -133,7 +133,7 @@ spec: - name: AAREG_SCOPE value: api://dev-fss.arbeidsforhold.aareg-services-nais/.default - name: EREG_BASE_URL - value: https://ereg-services-q2.dev-fss-pub.nais.io//api/v1 + value: https://ereg-services-q2.dev-fss-pub.nais.io/api/v1 - name: DOKARKIV_BASE_URL value: https://dokarkiv-q2.dev-fss-pub.nais.io - name: DOKARKIV_SCOPE