Oppdater github workflow (#144)

* Oppdater github workflow * Legg til dependabot.yml * Legg til dependabot.yml
navikt · Oct 2, 2023 · 2241039 · 2241039
1 parent 79dcd28
commit 2241039
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 41 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,20 @@
+version: 2
+updates:
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "[dependency] "
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "[docker] "
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: "[github-actions] "
diff --git a/.github/workflows/deploy_feature.yaml b/.github/workflows/deploy_feature.yaml
@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - '**'
+      - '!main'
+      - '!dependabot/**'
 
 env:
   GITHUB_USERNAME: x-access-token
@@ -16,7 +18,7 @@ jobs:
     name: Build with maven and docker
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           java-version: '17'
@@ -27,7 +29,7 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-      - run: mvn -Dmaven.test.skip=true -B -e --settings .m2/maven-settings.xml clean install
+      - run: mvn -Dmaven.test.skip=true -B -e clean install
       - uses: nais/docker-build-push@v0
         id: docker-push
         with:
@@ -43,26 +45,26 @@ jobs:
     name: Run tests
     needs: build
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'
       - uses: actions/cache@v3
         with:
-          path: ~/.m2
+          path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-      - run: mvn -B -e --settings .m2/maven-settings.xml clean install
+      - run: mvn -B -e clean install
 
   deploy-feature:
     runs-on: ubuntu-latest
     name: Deploy feature
     needs: build
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: deploy
       - name: Deploy to dev-gcp for feature.yaml

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -2,23 +2,21 @@ name: Deploy to dev
 on:
   pull_request:
     types: [ ready_for_review, opened, synchronize ]
-  push:
-    branches:
-      - 'main'
 
 env:
   GITHUB_USERNAME: x-access-token
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
   build:
+    if: github.event.pull_request.draft == false
     permissions:
       contents: "read"
       id-token: "write"
     name: Build with maven and docker
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           java-version: '17'
@@ -29,7 +27,7 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-      - run: mvn -Dmaven.test.skip=true -B -e --settings .m2/maven-settings.xml clean install
+      - run: mvn -Dmaven.test.skip=true -B -e clean install
       - uses: nais/docker-build-push@v0
         id: docker-push
         with:
@@ -45,25 +43,26 @@ jobs:
     name: Run tests
     needs: build
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'
       - uses: actions/cache@v3
         with:
-          path: ~/.m2
+          path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-      - run: mvn -B -e --settings .m2/maven-settings.xml clean install
+      - run: mvn -B -e clean install
 
   deploy-main:
+    if: github.actor != 'dependabot[bot]'
     runs-on: ubuntu-latest
     name: Deploy main
     needs: build
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: deploy
       - name: Deploy main branch to dev-gcp

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -15,7 +15,7 @@ jobs:
     name: Build with maven and docker
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           java-version: '17'
@@ -26,7 +26,7 @@ jobs:
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
-      - run: mvn -Dmaven.test.skip=true -B -e --settings .m2/maven-settings.xml clean install
+      - run: mvn -Dmaven.test.skip=true -B -e clean install
       - uses: nais/docker-build-push@v0
         id: docker-push
         with:
@@ -43,7 +43,7 @@ jobs:
     needs: build
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           path: deploy
       - uses: nais/deploy/actions/deploy@v1
@@ -64,7 +64,7 @@ jobs:
       contents: write
     needs: deploy
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Push latest image tag as github tag
         id: tag_version
         uses: mathieudutour/[email protected]

diff --git a/.github/workflows/rollback_prod.yaml b/.github/workflows/rollback_prod.yaml
@@ -19,7 +19,7 @@ jobs:
     name: Find tag to deploy
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: NAIS login
         uses: nais/login@v0
         id: login
@@ -50,7 +50,7 @@ jobs:
     needs: prepare_deploy
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: nais/deploy/actions/deploy@v1
         env:
           APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}

diff --git a/.m2/maven-settings.xml b/.m2/maven-settings.xml
diff --git a/.nais/feature.yaml b/.nais/feature.yaml
@@ -1,7 +1,6 @@
 name: bidrag-stonad-feature
 ingresses:
   - https://bidrag-stonad-feature.intern.dev.nav.no
-  - https://bidrag-stonad-feature.dev.intern.nav.no
 dbname: bidrag-stonad-feature
 kafka:
   pool: nav-dev

diff --git a/.nais/main.yaml b/.nais/main.yaml
@@ -1,7 +1,6 @@
 name: bidrag-stonad
 ingresses:
   - https://bidrag-stonad.intern.dev.nav.no
-  - https://bidrag-stonad.dev.intern.nav.no
 dbname: bidrag-stonad-main
 kafka:
   pool: nav-dev

diff --git a/.nais/nais.yaml b/.nais/nais.yaml
@@ -42,10 +42,6 @@ spec:
     requests:
       cpu: 500m
       memory: 1024Mi
-    replicas:
-      cpuThresholdPercentage: 80
-      max: 4
-      min: {{ spec.replicas.min }}
   ingresses:
   {{#each ingresses as |url|}}
      - {{url}}