Preprod-miljø i dev-gcp

.github/workflows/deploy_dev.yml

@@ -10,7 +10,7 @@ on:
         type: choice
         options:
           - 'mock'
-          - 'dev'
+          - 'preprod'
           - 'dev-fss'
 
 jobs:

nais/dev/dev.yaml → nais/dev/preprod.yaml

@@ -1,7 +1,7 @@
 apiVersion: "nais.io/v1alpha1"
 kind: "Application"
 metadata:
-  name: sosialhjelp-innsyn-api-dev
+  name: sosialhjelp-innsyn-api
   namespace: teamdigisos
   labels:
     team: teamdigisos
@@ -33,20 +33,6 @@ spec:
     scopes:
       consumes:
         - name: "ks:fiks"
-  idporten:
-    enabled: false # endre for å ta i bruk idporten-client
-    accessTokenLifetime: 3600 #default
-    clientURI: https://www.nav.no #default
-    frontchannelLogoutPath: /oauth2/logout
-    integrationType: api_klient
-    postLogoutRedirectURIs:
-      - https://www.nav.no #default
-    redirectPath: /oauth2/callback #default
-    scopes:
-      - openid
-      - profile
-      - ks:fiks
-    sessionLifetime: 7200 #default
   accessPolicy:
     outbound:
       external:
@@ -56,32 +42,34 @@ spec:
         - host: pdl-api.dev-fss-pub.nais.io
         - host: norg2.dev-fss-pub.nais.io
         - host: sosialhjelp-soknad-api.dev-fss-pub.nais.io
-        - host: oidc-ver2.difi.no
         - host: unleash.nais.io
         - host: digisos.intern.dev.nav.no
         - host: teamdigisos-unleash-api.nav.cloud.nais.io
+        - host: test.idporten.no
       rules:
         - application: sosialhjelp-innsyn-api-redis
-        - application: sosialhjelp-soknad-api-dev
+        - application: sosialhjelp-soknad-api
         - application: clamav
           namespace: clamav
-  ingresses:
-    - "https://digisos.intern.dev.nav.no/sosialhjelp/innsyn-api"
   resources:
     limits:
       cpu: 500m
       memory: 2Gi
     requests:
       cpu: 10m
       memory: 512Mi
+  redis:
+    - instance: cache
+      access: readwrite
   envFrom:
-    - secret: redis-password-innsyn-api
     - secret: fiks-integrasjon-secret
     - secret: fiks-kommune-integrasjon-secret
     - secret: sosialhjelp-innsyn-api-unleash-api-token
   env:
+    - name: IDPORTEN_WELL_KNOWN_URL
+      value: "https://test.idporten.no/.well-known/openid-configuration"
     - name: SPRING_PROFILES_ACTIVE
-      value: "idporten, log-kibana"
+      value: "log-kibana,preprod"
     - name: FIKS_DIGISOS_ENDPOINT_URL
       value: "https://api.fiks.test.ks.no"
     - name: FIKS_DOKUMENTLAGER_ENDPOINT_URL
@@ -96,8 +84,6 @@ spec:
       value: "10"
     - name: DOKUMENT_CACHE_TIME_TO_LIVE_SECONDS
       value: "3600"
-    - name: REDIS_HOST
-      value: "sosialhjelp-innsyn-api-redis.teamdigisos.svc.cluster.local"
     - name: PDL_ENDPOINT_URL
       value: "https://pdl-api.dev-fss-pub.nais.io/graphql"
     - name: PDL_AUDIENCE
@@ -112,12 +98,8 @@ spec:
       value: "http://clamav.nais-system.svc.nais.local/scan"
     - name: VILKAR_DOKKRAV_FAGSYSTEM_VERSJONER
       value: "Socio;10.1.16,mock-alt;1.0-MOCKVERSJON"
-    - name: SOKNAD_API_URL
-      value: "https://sosialhjelp-soknad-api.dev-fss-pub.nais.io/sosialhjelp/soknad-api"
-    - name: SOKNAD_API_AUDIENCE
-      value: "dev-fss:teamdigisos:sosialhjelp-soknad-api"
     - name: MASKINPORTEN_WELL_KNOWN_URL
-      value: "https://ver2.maskinporten.no/.well-known/oauth-authorization-server"
+      value: "https://test.maskinporten.no/.well-known/oauth-authorization-server"
     - name: IDPORTEN_POST_LOGOUT_REDIRECT_URI
       value: "https://www.dev.nav.no/no/utlogget"
     - name: KLAGE_ENABLED