Skip to content

Commit f6bbf2c

Browse files
authored
Fix aquasecurity github actions version issue (#7881)
* aquasecurity migrated all tags to use the v prefix for trivy-action * setup-trivy has v0.2.6 only in github now Signed-off-by: Lan Luo <lan.luo@broadcom.com>
1 parent a7012e6 commit f6bbf2c

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

.github/workflows/trivy_scan.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
docker pull antrea/antrea-controller-ubuntu:latest
4141
docker pull antrea/antrea-controller-ubuntu:${{ steps.find-antrea-greatest-version.outputs.antrea_version }}
4242
- name: Install Trivy
43-
uses: aquasecurity/setup-trivy@v0.2.3
43+
uses: aquasecurity/setup-trivy@v0.2.6
4444
- name: Get current UTC date
4545
id: date
4646
run: echo "date=$(date -u +'%Y-%m-%d')" >> $GITHUB_OUTPUT
@@ -68,7 +68,7 @@ jobs:
6868
key: ${{ steps.restore-db-cache.outputs.cache-primary-key }}
6969
- name: Run Trivy vulnerability scanner on latest antrea-agent Docker image
7070
if: ${{ always() && steps.pull.conclusion == 'success' }}
71-
uses: aquasecurity/trivy-action@0.31.0
71+
uses: aquasecurity/trivy-action@v0.35.0
7272
# we cannot use .trivy.yml as we need to override some config parameters
7373
# and that is not supported by aquasecurity/trivy-action
7474
with:
@@ -87,7 +87,7 @@ jobs:
8787
TRIVY_SKIP_JAVA_DB_UPDATE: true
8888
- name: Run Trivy vulnerability scanner on latest antrea-controller Docker image
8989
if: ${{ always() && steps.pull.conclusion == 'success' }}
90-
uses: aquasecurity/trivy-action@0.31.0
90+
uses: aquasecurity/trivy-action@v0.35.0
9191
# we cannot use .trivy.yml as we need to override some config parameters
9292
# and that is not supported by aquasecurity/trivy-action
9393
with:
@@ -105,7 +105,7 @@ jobs:
105105
TRIVY_SKIP_JAVA_DB_UPDATE: true
106106
- name: Run Trivy vulnerability scanner on antrea-agent Docker image for latest released version
107107
if: ${{ always() && steps.pull.conclusion == 'success' }}
108-
uses: aquasecurity/trivy-action@0.31.0
108+
uses: aquasecurity/trivy-action@v0.35.0
109109
with:
110110
scan-type: 'image'
111111
image-ref: 'antrea/antrea-agent-ubuntu:${{ steps.find-antrea-greatest-version.outputs.antrea_version }}'
@@ -121,7 +121,7 @@ jobs:
121121
TRIVY_SKIP_JAVA_DB_UPDATE: true
122122
- name: Run Trivy vulnerability scanner on antrea-controller Docker image for latest released version
123123
if: ${{ always() && steps.pull.conclusion == 'success' }}
124-
uses: aquasecurity/trivy-action@0.31.0
124+
uses: aquasecurity/trivy-action@v0.35.0
125125
with:
126126
scan-type: 'image'
127127
image-ref: 'antrea/antrea-controller-ubuntu:${{ steps.find-antrea-greatest-version.outputs.antrea_version }}'

.github/workflows/trivy_scan_before_release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
run: |
2020
./hack/build-antrea-linux-all.sh --pull
2121
- name: Install Trivy
22-
uses: aquasecurity/setup-trivy@v0.2.3
22+
uses: aquasecurity/setup-trivy@v0.2.6
2323
- name: Download Trivy DB
2424
# Always download the latest DB for releases, don't use a cached version.
2525
# Try downloading the vulnerability DB up to 5 times, to account for TOOMANYREQUESTS errors.
@@ -28,7 +28,7 @@ jobs:
2828
run: |
2929
for i in {1..5}; do trivy image --download-db-only --cache-dir $GITHUB_WORKSPACE/.cache/trivy && break || sleep 1; done
3030
- name: Run Trivy vulnerability scanner on the antrea-agent Docker image
31-
uses: aquasecurity/trivy-action@0.31.0
31+
uses: aquasecurity/trivy-action@v0.35.0
3232
with:
3333
scan-type: 'image'
3434
image-ref: 'antrea/antrea-agent-ubuntu:latest'
@@ -39,7 +39,7 @@ jobs:
3939
TRIVY_SKIP_DB_UPDATE: true
4040
TRIVY_SKIP_JAVA_DB_UPDATE: true
4141
- name: Run Trivy vulnerability scanner on the antrea-controller Docker image
42-
uses: aquasecurity/trivy-action@0.31.0
42+
uses: aquasecurity/trivy-action@v0.35.0
4343
with:
4444
scan-type: 'image'
4545
image-ref: 'antrea/antrea-controller-ubuntu:latest'

0 commit comments

Comments
 (0)