Merge branch 'master' into 3049-fix-third-party-code-assessment

yurake · Feb 26, 2023 · 445e82e · 445e82e
2 parents 40870e2 + c29dd7e
commit 445e82e
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/docker-image-ci.yml b/.github/workflows/docker-image-ci.yml
@@ -27,7 +27,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Cache Docker layers
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           path: /tmp/.buildx-cache
           key: ${{ github.ref }}-${{ github.sha }}

diff --git a/.github/workflows/java-ci.yml b/.github/workflows/java-ci.yml
@@ -37,13 +37,13 @@ jobs:
           languages: java
 
       - name: Cache SonarCloud packages
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar-parent-pom
           restore-keys: ${{ runner.os }}-sonar-parent-pom
       - name: Cache local Maven repository
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-parent-pom-${{ hashFiles('**/parent-pom/pom.xml') }}
@@ -56,13 +56,13 @@ jobs:
         run: ./mvnw -B deploy --settings ../.m2/settings.xml
 
       - name: Cache SonarCloud packages
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar-webapp-service
           restore-keys: ${{ runner.os }}-sonar-webapp-service
       - name: Cache local Maven repository
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-webapp-service-${{ hashFiles('**/webapp-service/pom.xml') }}
@@ -151,7 +151,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Cache Docker layers
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           path: /tmp/.buildx-cache
           key: ${{ github.ref }}-${{ github.sha }}
@@ -168,13 +168,13 @@ jobs:
           fi
 
       - name: Cache SonarCloud packages
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar-${{ matrix.application }}
           restore-keys: ${{ runner.os }}-sonar-${{ matrix.application }}
       - name: Cache local Maven repository
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ matrix.application }}-${{ hashFiles('**/${{ matrix.application }}/pom.xml') }}
@@ -266,7 +266,7 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Cache Docker layers
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           path: /tmp/.buildx-cache
           key: ${{ github.ref }}-${{ github.sha }}
@@ -283,13 +283,13 @@ jobs:
           fi
 
       - name: Cache SonarCloud packages
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar-${{ matrix.application }}
           restore-keys: ${{ runner.os }}-sonar-${{ matrix.application }}
       - name: Cache local Maven repository
-        uses: actions/[email protected].5
+        uses: actions/[email protected].6
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ matrix.application }}-${{ hashFiles('**/${{ matrix.application }}/pom.xml') }}

diff --git a/.github/workflows/snyk-infrastructure.yml b/.github/workflows/snyk-infrastructure.yml
@@ -37,7 +37,7 @@ jobs:
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
         with:
-          args: --severity-threshold=high --sarif-file-output=snyk.sarif
+          args: --severity-threshold=critical --sarif-file-output=snyk.sarif
       - name: Upload result to GitHub Code Scanning
         uses: github/codeql-action/upload-sarif@v2
         with:
@@ -56,7 +56,7 @@ jobs:
         env:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
         with:
-          args: --severity-threshold=high --sarif-file-output=snyk.sarif
+          args: --severity-threshold=critical --sarif-file-output=snyk.sarif
       - name: Upload result to GitHub Code Scanning
         uses: github/codeql-action/upload-sarif@v2
         with:

diff --git a/kubernetes/monitoring/jenkins/Dockerfile b/kubernetes/monitoring/jenkins/Dockerfile
@@ -1,4 +1,4 @@
-FROM jenkins/jenkins:2.391-alpine
+FROM jenkins/jenkins:2.392-alpine
 ARG BUILD_DATE
 ARG VCS_REF
 

diff --git a/kubernetes/redis/redis-deployment.yaml b/kubernetes/redis/redis-deployment.yaml
@@ -32,7 +32,7 @@ spec:
                 - redis-cli
                 - ping
         - name: redis-exporter
-          image: oliver006/redis_exporter:v1.46.0-alpine
+          image: oliver006/redis_exporter:v1.47.0-alpine
           ports:
             - containerPort: 9121
           livenessProbe: