Skip to content

Commit 8090ff6

Browse files
fix(1.31): pin setup-trivy to v0.2.6 by SHA (GHSA-69fq-xp46-6x23) (#5431)
* fix: pin setup-trivy to v0.2.6 by SHA (GHSA-69fq-xp46-6x23) * tests: fix prettier formatting in cni.yaml
1 parent e4dc6d7 commit 8090ff6

2 files changed

Lines changed: 1 addition & 3 deletions

File tree

.github/workflows/build-snap.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ jobs:
173173
run: |
174174
mkdir -p sarifs
175175
- name: Install Trivy vulnerability scanner
176-
uses: aquasecurity/setup-trivy@v0.2.2
176+
uses: aquasecurity/setup-trivy@3fb12ec12f41e471780db15c232d5dd185dcb514 # v0.2.6
177177
- name: Run Trivy vulnerability scanner on codebase
178178
run: |
179179
trivy fs . --format sarif --severity CRITICAL > sarifs/trivy-microk8s-repo-scan--results.sarif

tests/unit/yamls/cni.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3531,7 +3531,6 @@ status:
35313531
storedVersions: []
35323532

35333533
---
3534-
35353534
---
35363535
# Source: calico/templates/calico-kube-controllers-rbac.yaml
35373536

@@ -3618,7 +3617,6 @@ subjects:
36183617
name: calico-kube-controllers
36193618
namespace: kube-system
36203619
---
3621-
36223620
---
36233621
# Source: calico/templates/calico-node-rbac.yaml
36243622
# Include a clusterrole for the calico-node DaemonSet,

0 commit comments

Comments
 (0)