Merge branch 'master' into feature/statistikk-side

navikt · Oct 16, 2023 · f360759 · f360759
2 parents 1057ea1 + 3dc4cd0
commit f360759
Show file tree

Hide file tree

Showing 12 changed files with 398 additions and 132 deletions.
diff --git a/.github/workflows/idporten.yml b/.github/workflows/idporten.yml
@@ -0,0 +1,20 @@
+name: Deploy idporten
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - '.nais/idporten.yml'
+
+jobs:
+  deploy-idporten:
+    name: Deploy idporten
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: nais/deploy/actions/deploy@v1
+        env:
+          APIKEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
+          CLUSTER: prod-gcp
+          RESOURCE: .nais/idporten.yml
diff --git a/.github/workflows/maskinporten.yml b/.github/workflows/maskinporten.yml
@@ -0,0 +1,20 @@
+name: Deploy maskinporten
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - '.nais/maskinporten.yml'
+
+jobs:
+  deploy-maskinporten:
+    name: Deploy maskinporten
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: nais/deploy/actions/deploy@v1
+        env:
+          APIKEY: ${{ secrets.NAIS_DOLLY_DEPLOY_API_KEY }}
+          CLUSTER: prod-gcp
+          RESOURCE: .nais/maskinporten.yml
diff --git a/.nais/idporten.yml b/.nais/idporten.yml
@@ -0,0 +1,15 @@
+apiVersion: nais.io/v1
+kind: IDPortenClient
+metadata:
+  name: dolly
+  namespace: dolly
+spec:
+  clientURI: https://dolly-idporten.ekstern.dev.nav.no
+  frontchannelLogoutURI: https://dolly-idporten.ekstern.dev.nav.no/oauth2/logout
+  postLogoutRedirectURIs:
+    - https://dolly.ekstern.dev.nav.no/login
+    - https://dolly-idporten.ekstern.dev.nav.no/login
+  redirectURIs:
+    - https://dolly.ekstern.dev.nav.no/login/oauth2/code/idporten
+    - https://dolly-idporten.ekstern.dev.nav.no/login/oauth2/code/idporten
+  secretName: idporten-dolly-prod # deployes til prod. secret kopieres manuelt til dev.
diff --git a/.nais/maskinporten.yml b/.nais/maskinporten.yml
@@ -0,0 +1,10 @@
+apiVersion: nais.io/v1
+kind: MaskinportenClient
+metadata:
+  name: dolly
+  namespace: dolly
+spec:
+  scopes:
+    consumes:
+      - name: altinn:serviceowner
+  secretName: maskinporten-dolly-prod # deployes til prod. secret kopieres manuelt til dev.
diff --git a/apps/dolly-frontend/config.idporten.yml b/apps/dolly-frontend/config.idporten.yml
@@ -83,7 +83,7 @@ spec:
       memory: 2048Mi
   image: {{image}}
   envFrom:
-    - secret: idporten-dolly-dev-gcp
+    - secret: idporten-dolly-prod
   env:
     - name: SPRING_PROFILES_ACTIVE
       value: idporten
diff --git a/apps/dolly-frontend/config.yml b/apps/dolly-frontend/config.yml
@@ -92,7 +92,7 @@ spec:
       memory: 2048Mi
   image: {{image}}
   envFrom:
-    - secret: idporten-dolly-dev-gcp
+    - secret: idporten-dolly-prod
   env:
     - name: SPRING_PROFILES_ACTIVE
       value: prod