diff --git a/nais/dev-gcp.yaml b/nais/dev-gcp.yaml index 90324e3..875bcbe 100644 --- a/nais/dev-gcp.yaml +++ b/nais/dev-gcp.yaml @@ -36,7 +36,6 @@ spec: - name: ALTINN_URL value: "https://tt02.altinn.no" envFrom: - - configmap: loginservice-idporten - secret: altinn-rettigheter-proxy-redis-password - secret: altinn-rettigheter-proxy accessPolicy: diff --git a/nais/prod-gcp.yaml b/nais/prod-gcp.yaml index e6d62b0..5a22a10 100644 --- a/nais/prod-gcp.yaml +++ b/nais/prod-gcp.yaml @@ -36,14 +36,6 @@ spec: inbound: rules: - - application: klage-permittering-refusjon-api - namespace: teamloennskomp - cluster: prod-fss - - - application: permittering-refusjon-api - namespace: teamloennskomp - cluster: prod-fss - - application: sykefravarsstatistikk-api namespace: arbeidsgiver cluster: prod-fss @@ -65,10 +57,6 @@ spec: - application: permitteringsskjema-api namespace: permittering-og-nedbemanning - - application: innsyn-aareg-api - namespace: fager - cluster: prod-fss - - application: aareg-innsyn-arbeidsgiver-api namespace: arbeidsforhold cluster: prod-fss diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 1118356..d64fed1 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -43,10 +43,19 @@ management: no.nav.security.jwt: issuer: - loginservice: - discoveryurl: ${LOGINSERVICE_IDPORTEN_DISCOVERY_URL} - accepted_audience: ${LOGINSERVICE_IDPORTEN_AUDIENCE} tokenx: discoveryurl: ${TOKEN_X_WELL_KNOWN_URL} accepted_audience: ${TOKEN_X_CLIENT_ID} + +--- +spring: + config: + activate: + on-profile: prod + +no.nav.security.jwt: + issuer: + loginservice: + discoveryurl: ${LOGINSERVICE_IDPORTEN_DISCOVERY_URL} + accepted_audience: ${LOGINSERVICE_IDPORTEN_AUDIENCE}