Feature/q2 environment

.github/workflows/manual-deploy.yml

@@ -7,11 +7,12 @@ on:
       environment:
         description: 'Environment to deploy'
         required: true
-        default: 'preprod'
+        default: 'preprod-q1'
         type: choice
         options:
           - none
-          - preprod
+          - preprod-q1
+          - preprod-q2
           - loadtests
           - prod
 
@@ -52,10 +53,10 @@ jobs:
     outputs:
       image: ${{ steps.docker-build-push.outputs.image }}
 
-  deploy-preprod:
-    name: Deploy to preprod
+  deploy-preprod-q1:
+    name: Deploy to preprod-q1
     needs: build-and-push
-    if: github.event.inputs.environment == 'preprod'
+    if: github.event.inputs.environment == 'preprod-q1'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -66,6 +67,20 @@ jobs:
           VARS: .nais/config-preprod.json
           VAR: image=${{ needs.build-and-push.outputs.image }}
 
+  deploy-preprod-q2:
+    name: Deploy to preprod-q2
+    needs: build-and-push
+    if: github.event.inputs.environment == 'preprod-q2'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: dev-gcp
+          RESOURCE: .nais/nais.yml
+          VARS: .nais/config-preprod-q2.json
+          VAR: image=${{ needs.build-and-push.outputs.image }}
+
   deploy-loadtests:
     name: Deploy to preprod loadtests
     needs: build-and-push
@@ -96,8 +111,8 @@ jobs:
 
 
   deploy-alerts-preprod:
-    if: github.event.inputs.environment == 'preprod'
-    needs: deploy-preprod
+    needs: [deploy-preprod-q1, deploy-preprod-q2]
+    if: always() && (needs.deploy-preprod-q1.result == 'success' || needs.deploy-preprod-q2.result == 'success')
     name: Deploy alerts to dev
     runs-on: ubuntu-latest
     steps:

.nais/config-preprod-q2.json

@@ -0,0 +1,35 @@
+{
+	"appname": "soknadsarkiverer",
+	"profile": "dev",
+	"replicas-min": "2",
+	"replicas-max": "4",
+	"ingress": "https://soknadsarkiverer-gcp.intern.dev.nav.no",
+	"outboundRules": [
+		"soknadsfillager",
+		"innsending-api"
+	],
+	"outboundExternalHosts": [
+		"dokarkiv.dev-fss-pub.nais.io",
+		"soknadsfillager-gcp.intern.dev.nav.no",
+		"innsending-api-gcp.intern.dev.nav.no",
+		"saf.dev-fss-pub.nais.io"
+	],
+	"kafka-main-topic": "team-soknad.privat-soknadinnsending-v2-dev",
+	"kafka-processingeventlog-topic": "team-soknad.privat-soknadinnsending-processingeventlog-v2-dev",
+	"kafka-message-topic": "team-soknad.privat-soknadinnsending-messages-v2-dev",
+	"kafka-metrics-topic": "team-soknad.privat-soknadinnsending-metrics-v2-dev",
+	"filestorage-host": "https://soknadsfillager-gcp.intern.dev.nav.no",
+	"innsending-api-host": "https://innsending-api-gcp.intern.dev.nav.no",
+	"joark-host": "https://dokarkiv-q2.dev-fss-pub.nais.io",
+	"dokarkiv-scope": "api://dev-fss.teamdokumenthandtering.dokarkiv/.default",
+	"soknadsfillager-scope": "api://dev-gcp.team-soknad.soknadsfillager/.default",
+	"innsending-api-scope": "api://dev-gcp.team-soknad.innsending-api/.default",
+	"send-to-joark": "true",
+	"kafka-pool": "nav-dev",
+	"SAF_URL": "https://saf-q2.dev-fss-pub.nais.io/graphql",
+	"SAF_SCOPE": "api://dev-fss.teamdokumenthandtering.saf/.default",
+	"AZURE_TENANT": "trygdeetaten.no",
+	"AZURE_ALLOW_ALL_USERS": true,
+	"AZURE_ALLOWED_GROUPS": [],
+	"STATUS_LOG_URL": "https://logs.adeo.no/app/discover#/view/9aa683f0-df5d-11ed-8b42-0b0644af4500"
+}