deploy prod

navikt · Dec 31, 2023 · 052f7ed · 052f7ed
1 parent b44ec48
commit 052f7ed
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 136 deletions.
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -1,4 +1,5 @@
-name: Bygg, deploy til dev-gcp og lag release
+name: Build, deploy to & dev-gcp and create release
+
 on:
   push:
     paths-ignore:
@@ -8,135 +9,56 @@ on:
       - 'CODEOWNERS'
     branches:
       - main
-      - bosituasjon
 
 jobs:
-  test:
-    name: Kjør Cypress-tester
+  deploy:
+    name: Build and deploy
+    permissions:
+      packages: write
+      contents: write
+      id-token: write
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout code
         uses: actions/checkout@v4
-      - name: Cypress run
-        uses: cypress-io/github-action@v6
-        with:
-          start: npm run dev
-          wait-on: 'http://ip6-localhost:3001'
-          working-directory: client
-          config-file: cypress.config.ts
-          record: false
 
-  build:
-    name: Bygg
-    permissions:
-        packages: write
-        contents: write
-        id-token: write
-    runs-on: ubuntu-latest
-    timeout-minutes: 15
-    outputs:
-        docker_image: ${{ steps.docker-build-push.outputs.image }}
-    steps:
-      - uses: actions/checkout@v4
-      #- uses: navikt/digihot-deploy/actions/pre-deploy@v2
-      #  env:
-      #    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Pre-deploy
         uses: navikt/digihot-deploy/actions/pre-deploy@v3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          
-      - name: Push docker image to GAR
+
+      - name: Build and push docker image
         uses: nais/docker-build-push@v0
         id: docker-build-push
         with:
-           team: teamdigihot
-          #  image_suffix: hotsak-frontend
-           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} 
-           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
-           tag: ${{ env.VERSION_TAG }}
-
-  deploy-labs:
-     name: Deploy til labs-gcp
-     runs-on: ubuntu-latest
-     needs: [build]
-     permissions:
-        contents: write
-        id-token: write
-     timeout-minutes: 15
-     steps:
-        - uses: actions/checkout@v4
-        - uses: nais/deploy/actions/deploy@v2
-          env:
-             CLUSTER: dev-gcp
-             RESOURCE: .nais/labs.yaml
-             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
-     steps:
-        - uses: actions/checkout@v4
-
-        - name: Pre-deploy
-          uses: navikt/digihot-deploy/actions/pre-deploy@v3
-          env:
-            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-        - uses: nais/deploy/actions/deploy@v2
-          env:
-             CLUSTER: dev-gcp
-             RESOURCE: .nais/dev.yaml
-             IMAGE: ${{ needs.build.outputs.docker_image }}
-        # Foreløpig en bug med git tag
-        # - name: Set versjon
-        #   run: echo "VERSION_TAG = $(TZ=Europe/Oslo date +'%y.%j.%H%M%S')" >> $GITHUB_ENV
-        - uses: navikt/digihot-deploy/actions/post-deploy@v3
-          env:
-             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-             #VERSION_TAG: ${{ env.VERSION_TAG }}
-        - uses: actions/create-release@latest
-          env:
-             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          with:
-             tag_name: ${{ env.VERSION_TAG }}
-             release_name: hotsak-frontend ${{ env.VERSION_TAG }}
-             body: ${{ env.CHANGE_LOG }}
-             draft: true
-             prerelease: false
-
-  # create-release:
-  #   name: Lag release
-  #   if: github.ref == 'refs/heads/main'
-  #   runs-on: ubuntu-latest
-  #   needs: [deploy-dev]
-  #   permissions:
-  #      contents: write
-  #      id-token: write
-  #   steps:
-  #      - uses: actions/checkout@v4
-  #      - name: Set versjon
-  #        run: echo "VERSION_TAG = $(TZ=Europe/Oslo date +'%y.%j.%H%M%S')" >> $GITHUB_ENV
-  #      - name: Echo versjon
-  #        run: echo ${{ env.VERSION_TAG }}
-  #      - uses: navikt/digihot-deploy/actions/post-deploy@v3
-  #        env:
-  #           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #      - uses: actions/create-release@latest
-  #        env:
-  #           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-  #        with:
-  #           tag_name: ${{ env.VERSION_TAG }}
-  #           release_name: hotsak-frontend ${{ env.VERSION_TAG }}
-  #            #body: ${{ env.CHANGE_LOG }}
-  #           draft: true
-  #           prerelease: false
+          team: teamdigihot
+          identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
+          project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
+          tag: ${{ env.VERSION_TAG }}
 
+      - name: Deploy to dev-gcp (intern)
+        uses: nais/deploy/actions/deploy@v2
+        env:
+          CLUSTER: dev-gcp
+          RESOURCE: .nais/dev.yaml
+          PRINT_PAYLOAD: true
+          VAR: commit=${{ github.sha }}
+          IMAGE: ${{steps.docker-build-push.outputs.image}}
 
+      - name: post-deploy
+        if: github.ref == 'refs/heads/main'
+        uses: navikt/digihot-deploy/actions/post-deploy@v3
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-
+      - name: Create release
+        if: github.ref == 'refs/heads/main'
+        uses: actions/create-release@latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ env.VERSION_TAG }}
+          release_name: ${{ env.APPLICATION }} ${{ env.VERSION_TAG }}
+          body: ${{ env.CHANGE_LOG }}
+          draft: true
+          prerelease: false
diff --git a/.github/workflows/deploy-prod.yaml b/.github/workflows/deploy-prod.yaml
@@ -1,35 +1,27 @@
-name: Deploy til prod-gcp
-
+name: Deploy to prod-gcp
 on:
   release:
     types: [published]
 
 jobs:
   deploy-prod:
-    runs-on: ubuntu-latest
+    name: Deploy to prod-gcp and prod-mirror
     permissions:
-        id-token: write
-        contents: write
+      contents: "write"
+      id-token: "write"
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout code
+        uses: actions/checkout@v3
 
-      # - name: get release tag
-      #   env:
-      #     VERSION_TAG: ${{ github.event.release.tag_name }}
-      #   run: |
-      #     APPLICATION=$(echo $GITHUB_REPOSITORY | cut -d "/" -f 2)
-      #     IMAGE=ghcr.io/$GITHUB_REPOSITORY:$VERSION_TAG
-      #     echo "IMAGE=${IMAGE}" >> $GITHUB_ENV
-      #     echo $IMAGE
-
       - uses: nais/login@v0
         name: get image registry
         id: nais-login
         with:
           team: teamdigihot
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
-      
+
       - name: get image
         env:
           VERSION_TAG: ${{ github.event.release.tag_name }}
@@ -40,13 +32,14 @@ jobs:
           echo "IMAGE=${IMAGE}" >> $GITHUB_ENV
           echo $IMAGE
 
-      - uses: nais/deploy/actions/deploy@v2
-        name: Deploy til prod-gcp
+      - name: Deploy to prod-gcp
+        uses: nais/deploy/actions/deploy@v2
         env:
           CLUSTER: prod-gcp
           RESOURCE: .nais/prod.yaml
           VAR: commit=${{ github.sha }}
 
-      - uses: navikt/digihot-deploy/actions/post-production@v2
+      - name: Post-production
+        uses: navikt/digihot-deploy/actions/post-production@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}