chore: do not allow dependabot to deploy, add codecov token to workfl…

…ow (#73) * chore: do not allow dependabot to deploy, add codecov token to workflow, increase memreq according to #64, add cpu req, mem limit
Informasjonsforvaltning · Apr 2, 2024 · dcd1c90 · dcd1c90
1 parent 45a22d6
commit dcd1c90
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/deploy-prod&demo.yaml b/.github/workflows/deploy-prod&demo.yaml
@@ -8,7 +8,6 @@ on:
 jobs:
   build-catalog-admin-service:
     name: Build when pull request is created
-    if: github.event.pull_request.draft == false
     uses: Informasjonsforvaltning/workflows/.github/workflows/build-push.yaml@main
     with:
       app_name: catalog-admin-service
@@ -18,6 +17,7 @@ jobs:
     secrets:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       GCP_SA_DIGDIR_FDK_GCR_KEY: ${{ secrets.GCP_SA_DIGDIR_FDK_GCR_KEY }}
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   deploy-prod:
     name: Deploy to prod environment

diff --git a/.github/workflows/deploy-staging.yaml b/.github/workflows/deploy-staging.yaml
@@ -9,7 +9,7 @@ on:
 jobs:
   build-catalog-admin-service:
     name: Build when pull request is created
-    if: github.event.pull_request.draft == false
+    if: ${{ github.actor != 'dependabot[bot]' && github.event.pull_request.draft == false }}
     uses: Informasjonsforvaltning/workflows/.github/workflows/build-push.yaml@main
     with:
       app_name: catalog-admin-service
@@ -19,10 +19,10 @@ jobs:
     secrets:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       GCP_SA_DIGDIR_FDK_GCR_KEY: ${{ secrets.GCP_SA_DIGDIR_FDK_GCR_KEY }}
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   deploy:
     name: Deploy to staging environment
-    if: github.event.pull_request.draft == false
     needs: [ build-catalog-admin-service ]
     uses: Informasjonsforvaltning/workflows/.github/workflows/kustomize-deploy.yaml@main
     with:

diff --git a/deploy/base/deployment-catalog-admin-service.yaml b/deploy/base/deployment-catalog-admin-service.yaml
@@ -43,4 +43,7 @@ spec:
             failureThreshold: 5
           resources:
             requests:
-              memory: 100Mi
+              cpu: 50m
+              memory: 500Mi
+            limits:
+              memory: 500Mi