From 24993b2cf6a35d118b89a07a4ac3769c18fe8098 Mon Sep 17 00:00:00 2001
From: skykanin <3789764+skykanin@users.noreply.github.com>
Date: Mon, 6 Jan 2025 10:24:56 +0100
Subject: [PATCH] remove temporary changes

---
 .github/workflows/build-and-push.yaml   | 77 -------------------------
 .github/workflows/build-deploy-app.yaml |  5 --
 2 files changed, 82 deletions(-)
 delete mode 100644 .github/workflows/build-and-push.yaml

diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
deleted file mode 100644
index b71e9e7..0000000
--- a/.github/workflows/build-and-push.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-name: Build and Deploy Docker Image
-
-permissions:
-  contents: read
-  id-token: write
-
-on:
-  push:
-    branches:
-      - develop
-      - main
-    paths:
-      - 'src/**'
-      - 'server.js'
-      - 'index.html'
-      - 'tsconfig.json'
-      - 'tsconfig.node.json'
-      - 'vite.config.ts'
-      - 'package.json'
-      - 'package-lock.json'
-      - 'Dockerfile'
-  release:
-    types: [published]
-  workflow_dispatch:
-
-env:
-  REGISTRY: europe-north1-docker.pkg.dev/${{ secrets.GAR_PROJECT_ID }}/dapla-stat-docker
-  IMAGE: dapla-ctrl
-  TAG: ${{ github.ref_name }}-${{ github.sha }}
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repo
-        uses: actions/checkout@v3
-
-      - id: 'auth'
-        name: 'Authenticate to Google Cloud'
-        uses: 'google-github-actions/auth@v1.1.1'
-        with:
-          workload_identity_provider: 'projects/${{ secrets.GAR_PROJECT_NUMBER }}/locations/global/workloadIdentityPools/gh-actions/providers/gh-actions'
-          service_account: 'gh-actions-dapla-stat@${{ secrets.GAR_PROJECT_ID }}.iam.gserviceaccount.com'
-          token_format: 'access_token'
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to registry
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: 'oauth2accesstoken'
-          password: '${{ steps.auth.outputs.access_token }}'
-
-      - name: Docker meta
-        id: metadata
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE }}
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr,suffix=-${{ github.event.pull_request.head.sha }}
-            type=raw,value={{branch}}-{{sha}}-{{date 'YYYYMMDDHHmmss'}},enable={{is_default_branch}}
-            type=semver,pattern=v{{version}}
-            type=semver,pattern=v{{major}}.{{minor}}
-            type=semver,pattern=v{{major}}
-            type=raw,value=${{ env.TAG }}, enable=true
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ steps.metadata.outputs.tags }}
diff --git a/.github/workflows/build-deploy-app.yaml b/.github/workflows/build-deploy-app.yaml
index 32347c6..4964121 100644
--- a/.github/workflows/build-deploy-app.yaml
+++ b/.github/workflows/build-deploy-app.yaml
@@ -1,6 +1,4 @@
 on:
-  # FIXME: Remove this line, just for testing in PR
-  pull_request:
   release:
     types: [published]
   push:
@@ -66,9 +64,6 @@ jobs:
           else
             echo "cluster=test" >> "$GITHUB_OUTPUT"
             echo "nais_config_path=.nais/test.yaml" >> "$GITHUB_OUTPUT"
-            # TODO: Remove temporary prod deploy
-            echo "cluster=prod" >> "$GITHUB_OUTPUT"
-            echo "nais_config_path=.nais/prod.yaml" >> "$GITHUB_OUTPUT"
           fi
 
   build-push-deploy: