rebase main

taniaholst · taniaholst · commit 1b77f0b67c06 · 2025-02-25T13:05:50.000+01:00
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -1,5 +1,4 @@
 name: Build and test
-
 on:
     push:
 
diff --git a/.github/workflows/deploy-to-nais.yml b/.github/workflows/deploy-to-nais.yml
@@ -1,56 +1,56 @@
 name: Deploy to nais
 on:
-  workflow_call:
-    inputs:
-      image:
-        required: true
-        type: string
-      cluster:
-        required: true
-        type: string
-      config_file:
-        required: true
-        type: string
-      vars_file:
-        required: true
-        type: string
-      hpa_file:
-        required: false
-        type: string
-      deploy_valkey:
-        required: false
-        type: boolean
+    workflow_call:
+        inputs:
+            image:
+                required: true
+                type: string
+            cluster:
+                required: true
+                type: string
+            config_file:
+                required: true
+                type: string
+            vars_file:
+                required: true
+                type: string
+            hpa_file:
+                required: false
+                type: string
+            deploy_valkey:
+                required: false
+                type: boolean
 
 jobs:
-  deploy:
-    name: Deploy to nais k8s
-    runs-on: ubuntu-latest
-    permissions:
-      id-token: write
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v4
-      - name: Deploy Valkey
-        if: ${{ inputs.deploy_valkey == true }}
-        uses: nais/deploy/actions/deploy@v2
-        timeout-minutes: 1
-        continue-on-error: true
-        env:
-          CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: .nais/valkey.yml
-          VARS: .nais/vars/${{ inputs.vars_file }}
-      - name: Deploy HPA
-        if: ${{ inputs.hpa_file }}
-        uses: nais/deploy/actions/deploy@v2
-        timeout-minutes: 1
-        continue-on-error: true
-        env:
-          CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: .nais/hpa/${{inputs.hpa_file}}
-      - name: Deploy application
-        uses: nais/deploy/actions/deploy@v2
-        env:
-          CLUSTER: ${{ inputs.cluster }}
-          RESOURCE: .nais/${{ inputs.config_file }}
-          VAR: image=${{ inputs.image }}
-          VARS: .nais/vars/${{ inputs.vars_file }}
+    deploy:
+        name: Deploy to nais k8s
+        runs-on: ubuntu-latest
+        permissions:
+            id-token: write
+        steps:
+            - name: Checkout repo
+              uses: actions/checkout@v4
+            - name: Deploy Valkey
+              if: ${{ inputs.deploy_valkey == true }}
+              uses: nais/deploy/actions/deploy@v2
+              timeout-minutes: 1
+              continue-on-error: true
+              env:
+                  CLUSTER: ${{ inputs.cluster }}
+                  RESOURCE: .nais/valkey.yml
+                  VARS: .nais/vars/${{ inputs.vars_file }}
+            - name: Deploy HPA
+              if: ${{ inputs.hpa_file }}
+              uses: nais/deploy/actions/deploy@v2
+              timeout-minutes: 1
+              continue-on-error: true
+              env:
+                  CLUSTER: ${{ inputs.cluster }}
+                  RESOURCE: .nais/hpa/${{inputs.hpa_file}}
+            - name: Deploy application
+              uses: nais/deploy/actions/deploy@v2
+              env:
+                  CLUSTER: ${{ inputs.cluster }}
+                  RESOURCE: .nais/${{ inputs.config_file }}
+                  VAR: image=${{ inputs.image }}
+                  VARS: .nais/vars/${{ inputs.vars_file }}
diff --git a/.github/workflows/deploy.dev2.yml b/.github/workflows/deploy.dev2.yml
@@ -12,40 +12,40 @@ on:
                     - development
 
 jobs:
-  build:
-    uses: ./.github/workflows/build-image.yml
-    permissions:
-      contents: read
-      id-token: write
-    with:
-      environment: dev-gcp:dev2
-      imagename: dev2-deploy
-      ENV: dev2
-      ADMIN_ORIGIN: https://portal-admin-q6.oera.no
-      APP_ORIGIN: https://www-2.ansatt.dev.nav.no
-      REVALIDATOR_PROXY_ORIGIN: http://nav-enonicxp-frontend-revalidator-proxy-dev2
-      DECORATOR_URL: https://dekoratoren-beta.intern.dev.nav.no
-      XP_ORIGIN: https://www-q6.nav.no
-      TELEMETRY_URL: https://telemetry.ekstern.dev.nav.no/collect
-      INNLOGGINGSSTATUS_URL: https://www.ekstern.dev.nav.no/person/nav-dekoratoren-api/auth
-      RELEASE_TAG: dev2-${{ github.sha }}
-      MELDEKORT_API_URL: https://meldekort-api-q1.intern.dev.nav.no/meldekort/meldekort-api/api/person
-      NAVNO_SEARCH_API_URL: https://navno-search-api.ekstern.dev.nav.no/content/search-url
-      FAILOVER_ORIGIN: https://www-2-failover.intern.dev.nav.no
-      NODE_ENV: ${{ inputs.NODE_ENV }}
-    secrets:
-      READER_TOKEN: ${{ secrets.READER_TOKEN }}
-      SERVICE_SECRET: ${{ secrets.SERVICE_SECRET }}
-      NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
-  deploy:
-    uses: ./.github/workflows/deploy-to-nais.yml
-    needs: build
-    permissions:
-      id-token: write
-    with:
-      image: ${{ needs.build.outputs.image }}
-      cluster: dev-gcp
-      vars_file: vars-dev2.yml
-      config_file: config.yml
-      hpa_file: hpa-dev2.yml
-      deploy_valkey: true
+    build:
+        uses: ./.github/workflows/build-image.yml
+        permissions:
+            contents: read
+            id-token: write
+        with:
+            environment: dev-gcp:dev2
+            imagename: dev2-deploy
+            ENV: dev2
+            ADMIN_ORIGIN: https://portal-admin-q6.oera.no
+            APP_ORIGIN: https://www-2.ansatt.dev.nav.no
+            REVALIDATOR_PROXY_ORIGIN: http://nav-enonicxp-frontend-revalidator-proxy-dev2
+            DECORATOR_URL: https://dekoratoren-beta.intern.dev.nav.no
+            XP_ORIGIN: https://www-q6.nav.no
+            TELEMETRY_URL: https://telemetry.ekstern.dev.nav.no/collect
+            INNLOGGINGSSTATUS_URL: https://www.ekstern.dev.nav.no/person/nav-dekoratoren-api/auth
+            RELEASE_TAG: dev2-${{ github.sha }}
+            MELDEKORT_API_URL: https://meldekort-api-q1.intern.dev.nav.no/meldekort/meldekort-api/api/person
+            NAVNO_SEARCH_API_URL: https://navno-search-api.ekstern.dev.nav.no/content/search-url
+            FAILOVER_ORIGIN: https://www-2-failover.intern.dev.nav.no
+            NODE_ENV: ${{ inputs.NODE_ENV }}
+        secrets:
+            READER_TOKEN: ${{ secrets.READER_TOKEN }}
+            SERVICE_SECRET: ${{ secrets.SERVICE_SECRET }}
+            NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+    deploy:
+        uses: ./.github/workflows/deploy-to-nais.yml
+        needs: build
+        permissions:
+            id-token: write
+        with:
+            image: ${{ needs.build.outputs.image }}
+            cluster: dev-gcp
+            vars_file: vars-dev2.yml
+            config_file: config.yml
+            hpa_file: hpa-dev2.yml
+            deploy_valkey: true
diff --git a/.github/workflows/deploy.prod.yml b/.github/workflows/deploy.prod.yml
@@ -5,43 +5,43 @@ on:
             - main
 
 jobs:
-  build:
-    uses: ./.github/workflows/build-image.yml
-    permissions:
-      contents: read
-      id-token: write
-    with:
-      environment: prod-gcp
-      imagename: release-${{ github.ref_name }}
-      ENV: prod
-      ADMIN_ORIGIN: https://portal-admin.oera.no
-      APP_ORIGIN: https://www.nav.no
-      REVALIDATOR_PROXY_ORIGIN: http://nav-enonicxp-frontend-revalidator-proxy
-      DECORATOR_URL: https://www.nav.no/nav-dekoratoren
-      XP_ORIGIN: https://www.nav.no
-      TELEMETRY_URL: https://telemetry.nav.no/collect
-      INNLOGGINGSSTATUS_URL: https://www.nav.no/person/nav-dekoratoren-api/auth
-      NAVNO_SEARCH_API_URL: https://navno-search-api.nav.no/content/search-url
-      RELEASE_TAG: ${{  github.ref_name }}
-      MELDEKORT_API_URL: https://meldekort-api.nav.no/meldekort/meldekort-api/api/person
-      FAILOVER_ORIGIN: https://www-failover.nav.no
-      NODE_ENV: production
-    secrets:
-      READER_TOKEN: ${{ secrets.READER_TOKEN }}
-      SERVICE_SECRET: ${{ secrets.SERVICE_SECRET }}
-      NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
-  deploy:
-    uses: ./.github/workflows/deploy-to-nais.yml
-    needs: build
-    permissions:
-      id-token: write
-    with:
-      image: ${{ needs.build.outputs.image }}
-      cluster: prod-gcp
-      vars_file: vars-prod.yml
-      config_file: config.yml
-      hpa_file: hpa-prod.yml
-      deploy_valkey: true
+    build:
+        uses: ./.github/workflows/build-image.yml
+        permissions:
+            contents: read
+            id-token: write
+        with:
+            environment: prod-gcp
+            imagename: release-${{ github.ref_name }}
+            ENV: prod
+            ADMIN_ORIGIN: https://portal-admin.oera.no
+            APP_ORIGIN: https://www.nav.no
+            REVALIDATOR_PROXY_ORIGIN: http://nav-enonicxp-frontend-revalidator-proxy
+            DECORATOR_URL: https://www.nav.no/nav-dekoratoren
+            XP_ORIGIN: https://www.nav.no
+            TELEMETRY_URL: https://telemetry.nav.no/collect
+            INNLOGGINGSSTATUS_URL: https://www.nav.no/person/nav-dekoratoren-api/auth
+            NAVNO_SEARCH_API_URL: https://navno-search-api.nav.no/content/search-url
+            RELEASE_TAG: ${{  github.ref_name }}
+            MELDEKORT_API_URL: https://meldekort-api.nav.no/meldekort/meldekort-api/api/person
+            FAILOVER_ORIGIN: https://www-failover.nav.no
+            NODE_ENV: production
+        secrets:
+            READER_TOKEN: ${{ secrets.READER_TOKEN }}
+            SERVICE_SECRET: ${{ secrets.SERVICE_SECRET }}
+            NAIS_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+    deploy:
+        uses: ./.github/workflows/deploy-to-nais.yml
+        needs: build
+        permissions:
+            id-token: write
+        with:
+            image: ${{ needs.build.outputs.image }}
+            cluster: prod-gcp
+            vars_file: vars-prod.yml
+            config_file: config.yml
+            hpa_file: hpa-prod.yml
+            deploy_valkey: true
 
     release:
         name: Create a new release

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`name: Build and test`
`2`		`-`
`3`	`2`	`on:`
`4`	`3`	`push:`
`5`	`4`