Skip to content

Commit

Permalink
Update GitHub actions dependencies (keycloak#11952)
Browse files Browse the repository at this point in the history
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: andreaTP <andrea.peruffo1982@gmail.com>
  • Loading branch information
3 people authored May 12, 2022
1 parent d2d68c2 commit 83ef30c
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-java-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ jobs:
run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/

- name: Initialize CodeQL
uses: github/codeql-action/init@v2.1.8
uses: github/codeql-action/init@v2.1.9
with:
languages: java

- name: Build Keycloak
run: mvn install -Dmaven.test.skip -DskipQuarkus -DskipTestsuite -DskipExamples -DskipTests

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2.1.8
uses: github/codeql-action/analyze@v2.1.9
env:
CODEQL_ACTION_EXTRA_OPTIONS: '{"database":{"interpret-results":["--max-paths",0]}}'
4 changes: 2 additions & 2 deletions .github/workflows/codeql-js-adapter-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/

- name: Initialize CodeQL
uses: github/codeql-action/init@v2.1.8
uses: github/codeql-action/init@v2.1.9
env:
CODEQL_ACTION_EXTRA_OPTIONS: '{"database":{"finalize":["--no-run-unnecessary-builds"]}}'
with:
Expand All @@ -43,6 +43,6 @@ jobs:
run: mvn install -Dmaven.test.skip -DskipQuarkus -DskipTestsuite -DskipExamples -DskipTests

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2.1.8
uses: github/codeql-action/analyze@v2.1.9
env:
CODEQL_ACTION_EXTRA_OPTIONS: '{"database":{"interpret-results":["--max-paths",0]}}'
4 changes: 2 additions & 2 deletions .github/workflows/codeql-theme-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: mkdir -p ~/.m2 ; cp .github/settings.xml ~/.m2/

- name: Initialize CodeQL
uses: github/codeql-action/init@v2.1.8
uses: github/codeql-action/init@v2.1.9
env:
CODEQL_ACTION_EXTRA_OPTIONS: '{"database":{"finalize":["--no-run-unnecessary-builds"]}}'
with:
Expand All @@ -43,6 +43,6 @@ jobs:
run: mvn install -Dmaven.test.skip -DskipQuarkus -DskipTestsuite -DskipExamples -DskipTests

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2.1.8
uses: github/codeql-action/analyze@v2.1.9
env:
CODEQL_ACTION_EXTRA_OPTIONS: '{"database":{"interpret-results":["--max-paths",0]}}'
6 changes: 3 additions & 3 deletions .github/workflows/operator-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
java-version: ${{ env.JDK_VERSION }}
cache: 'maven'
- name: Setup Minikube-Kubernetes
uses: manusa/actions-setup-minikube@v2.4.3
uses: manusa/actions-setup-minikube@v2.6.0
with:
minikube version: ${{ env.MINIKUBE_VERSION }}
kubernetes version: ${{ env.KUBERNETES_VERSION }}
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
java-version: ${{ env.JDK_VERSION }}
cache: 'maven'
- name: Setup Minikube-Kubernetes
uses: manusa/actions-setup-minikube@v2.4.3
uses: manusa/actions-setup-minikube@v2.6.0
with:
minikube version: ${{ env.MINIKUBE_VERSION }}
kubernetes version: ${{ env.KUBERNETES_VERSION }}
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
java-version: ${{ env.JDK_VERSION }}
cache: 'maven'
- name: Setup Minikube-Kubernetes
uses: manusa/actions-setup-minikube@v2.4.3
uses: manusa/actions-setup-minikube@v2.6.0
with:
minikube version: ${{ env.MINIKUBE_VERSION }}
kubernetes version: ${{ env.KUBERNETES_VERSION }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/release-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
uses: actions/checkout@v3

- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2

- name: Container metadata
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: quay.io/keycloak/keycloak
tags: |
Expand All @@ -31,14 +31,14 @@
type=semver,pattern={{major}}.{{minor}}
- name: Login to Quay
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
password: ${{ secrets.QUAY_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: quarkus/container
platforms: linux/amd64,linux/arm64
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-operator-container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- name: Container metadata
id: meta
uses: docker/metadata-action@v3
uses: docker/metadata-action@v4
with:
images: quay.io/keycloak/keycloak-operator
tags: |
Expand All @@ -29,7 +29,7 @@ jobs:
type=semver,pattern={{major}}.{{minor}}
- name: Login to Quay
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
registry: quay.io
username: ${{ secrets.QUAY_USERNAME }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snyk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

- name: Upload scanner results to GitHub
uses: github/codeql-action/upload-sarif@v2.1.8
uses: github/codeql-action/upload-sarif@v2.1.9
with:
sarif_file: quarkus-report.sarif

Expand Down Expand Up @@ -60,6 +60,6 @@ jobs:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}

- name: Upload scanner results for the Operator to GitHub
uses: github/codeql-action/upload-sarif@v2.1.8
uses: github/codeql-action/upload-sarif@v2.1.9
with:
sarif_file: operator-report.sarif
12 changes: 6 additions & 6 deletions .github/workflows/trivy-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: "ubuntu-18.04"
steps:
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@40c4ca9e7421287d0c5576712fdff370978f9c3c
uses: aquasecurity/trivy-action@2b30463ddb3d11724a04e760e020c7d9af24d8b3
with:
image-ref: 'quay.io/keycloak/keycloak:nightly'
format: 'template'
Expand All @@ -20,7 +20,7 @@ jobs:
ignore-unfixed: true

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2.1.8
uses: github/codeql-action/upload-sarif@v2.1.9
with:
sarif_file: 'trivy-results.sarif'

Expand All @@ -29,7 +29,7 @@ jobs:
runs-on: "ubuntu-18.04"
steps:
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@40c4ca9e7421287d0c5576712fdff370978f9c3c
uses: aquasecurity/trivy-action@2b30463ddb3d11724a04e760e020c7d9af24d8b3
with:
image-ref: 'quay.io/keycloak/keycloak:legacy'
format: 'template'
Expand All @@ -39,7 +39,7 @@ jobs:
ignore-unfixed: true

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2.1.8
uses: github/codeql-action/upload-sarif@v2.1.9
with:
sarif_file: 'legacy-results.sarif'

Expand All @@ -48,7 +48,7 @@ jobs:
runs-on: "ubuntu-18.04"
steps:
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@40c4ca9e7421287d0c5576712fdff370978f9c3c
uses: aquasecurity/trivy-action@2b30463ddb3d11724a04e760e020c7d9af24d8b3
with:
image-ref: 'quay.io/keycloak/keycloak-operator:nightly'
format: 'template'
Expand All @@ -58,6 +58,6 @@ jobs:
ignore-unfixed: true

- name: Upload Trivy scan results to GitHub Security tab
uses: github/codeql-action/upload-sarif@v2.1.8
uses: github/codeql-action/upload-sarif@v2.1.9
with:
sarif_file: 'operator-results.sarif'
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,9 @@ public void testMainIngressDurability() {
kc.getSpec().setDisableDefaultIngress(true);
K8sUtils.deployKeycloak(k8sclient, kc, true);

assertThat(k8sclient.network().v1().ingresses().inNamespace(namespace).list().getItems().size()).isEqualTo(0);
Awaitility.await()
.untilAsserted(() -> {
assertThat(k8sclient.network().v1().ingresses().inNamespace(namespace).list().getItems().size()).isEqualTo(0);
});
}
}

0 comments on commit 83ef30c

Please sign in to comment.