Deploy på samme måte som andre FE brilleapps

Author: anostoga

.github/workflows/deploy-dev.yml

@@ -1,78 +1,99 @@
-name: Build, deploy to dev-gcp
+name: Bygg, deploy til dev-gcp og lag release
 on:
   push:
     paths-ignore:
       - '**.md'
       - '.gitignore'
       - 'LICENCE'
       - 'CODEOWNERS'
-      - 'docs/**'
-      - 'docs'
-      - 'docs/'
-      - '/docs'
     branches:
-      - main_
-
-env:
-  IMAGE: 'ghcr.io/navikt/hm-brilleavtale-frontend:${{ github.sha }}'
+      - main
 
 jobs:
-
   build:
+    name: Bygg
     runs-on: ubuntu-latest
     permissions:
       contents: "write"
       id-token: "write"
       packages: "write"
     timeout-minutes: 15
+    outputs:
+      docker_image: ${{ steps.docker-build-push.outputs.image }}
+      version_tag: ${{ steps.version-tag.outputs.VERSION_TAG}}
+
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
       - name: pre-deploy
-        uses: navikt/digihot-deploy/actions/pre-deploy@v2
+        uses: navikt/digihot-deploy/actions/pre-deploy@v3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DOCKER_IMAGE: ghcr.io/navikt/hm-brilleavtale-frontend
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
 
-      - name: Login to GitHub Package Repository
-        uses: docker/login-action@v2
+      - name: Bygg og push Docker image
+        uses: nais/docker-build-push@v0
+        id: docker-build-push
         with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          team: teamdigihot
+          identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
+          tag: ${{ env.VERSION_TAG }}
+          build_secrets: NODE_AUTH_TOKEN=${{ secrets.READER_TOKEN }}
 
-      - name: Set up .npmrc to use in Docker build
-        uses: actions/setup-node@v3
-        with:
-          registry-url: "https://npm.pkg.github.com"
+      - name: Definer release tag
+        id: version-tag
+        run: echo "VERSION_TAG=${{env.VERSION_TAG}}" >> "$GITHUB_OUTPUT"
+
+  deploy-labs:
+    name: Deploy til labs-gcp
+    runs-on: ubuntu-latest
+    needs: [build]
+    permissions:
+      contents: write
+      id-token: write
+    timeout-minutes: 15
 
-      - run: cp $NPM_CONFIG_USERCONFIG .npmrc
+    steps:
+      - name: Sjekk ut koden
+        uses: actions/checkout@v4
 
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          tags: ${{ env.IMAGE }}
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          secrets: |
-            "NODE_AUTH_TOKEN=${{ secrets.READER_TOKEN }}"
-      - name: deploy to dev
-        uses: nais/deploy/actions/deploy@v1
+      - name: Deploy
+        uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: dev-gcp
+          RESOURCE: .nais/labs.yml
+          IMAGE: ${{ needs.build.outputs.docker_image }}
+
+  deploy-dev:
+    name: Deploy til dev-gcp
+    runs-on: ubuntu-latest
+    needs: [ build ]
+    permissions:
+      contents: write
+      id-token: write
+    timeout-minutes: 15
+    env:
+      VERSION_TAG: ${{ needs.build.outputs.version_tag }}
+
+    steps:
+      - name: Sjekk ut koden
+        uses: actions/checkout@v4
+
+      - name: Deploy
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: dev-gcp
           RESOURCE: .nais/dev.yml
-          VAR: image=${{ env.IMAGE }},commit=${{ github.sha }}
-      - name: post-deploy
+          IMAGE: ${{ needs.build.outputs.docker_image }}
+
+      - name: Etter deploy
         if: github.ref == 'refs/heads/main'
-        uses: navikt/digihot-deploy/actions/post-deploy@v2
+        uses: navikt/digihot-deploy/actions/post-deploy@v3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: draft release
+
+      - name: Lag release
         if: github.ref == 'refs/heads/main'
         uses: actions/create-release@latest
         env:
@@ -82,12 +103,4 @@ jobs:
           release_name: ${{ env.APPLICATION }} ${{ env.VERSION_TAG }}
           body: ${{ env.CHANGE_LOG }}
           draft: true
-          prerelease: false
-      - name: deploy to labs
-        uses: nais/deploy/actions/deploy@v1
-        env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
-          CLUSTER: dev-gcp
-          RESOURCE: .nais/labs.yml
-          VAR: image=${{ env.IMAGE }},commit=${{ github.sha }}
-
+          prerelease: false

.github/workflows/deploy-prod.yml

@@ -1,27 +1,47 @@
-name: deploy-prod
+name: Deploy til prod-gcp
+
 on:
   release:
-    types: [published]
+    types:
+      - published
 
 jobs:
   deploy-prod:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
+
     steps:
-      - uses: actions/checkout@v1
-      - name: get release tag
+      - name: Sjekk ut koden
+        uses: actions/checkout@v4
+
+      - name: NAIS-login
+        uses: nais/login@v0
+        id: nais-login
+        with:
+          team: teamdigihot
+          identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
+
+      - name: Definer release tag
         env:
           VERSION_TAG: ${{ github.event.release.tag_name }}
+          REGISTRY: ${{ steps.nais-login.outputs.registry }}
+          APP: ${{ github.event.repository.name }}
         run: |
-          IMAGE=ghcr.io/$GITHUB_REPOSITORY:$VERSION_TAG
+          IMAGE=$REGISTRY/$APP:$VERSION_TAG
           echo "IMAGE=${IMAGE}" >> $GITHUB_ENV
           echo $IMAGE
-      - uses: nais/deploy/actions/deploy@v1
-        name: deploy to prod-gcp
+
+      - name: Deploy til prod-gcp
+        uses: nais/deploy/actions/deploy@v2
         env:
-          APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
           CLUSTER: prod-gcp
           RESOURCE: .nais/prod.yml
-      - name: post-production
+          VAR: commit=${{ github.sha }}
+
+      - name: Etter deploy
         uses: navikt/digihot-deploy/actions/post-production@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}