diff --git a/.github/workflows/deploy-prod&demo.yaml b/.github/workflows/deploy-prod&demo.yaml index ccfd152..daf92eb 100644 --- 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 index 619ea75..851c93f 100644 --- 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 index 4f1b45e..75c8ffc 100644 --- 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 \ No newline at end of file + cpu: 50m + memory: 500Mi + limits: + memory: 500Mi