Skip to content

Commit b3665e0

Browse files
authored
Merge pull request #7874 from ykakarap/trivy-scan-release-branches
🌱 setup Trivy scanning for supported release branches
2 parents ccba46e + 7fdc285 commit b3665e0

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.github/workflows/scan.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,19 @@ permissions: {}
99

1010
jobs:
1111
scan:
12+
strategy:
13+
matrix:
14+
branch: [ main, release-1.3, release-1.2 ]
1215
name: Trivy
1316
runs-on: ubuntu-latest
1417
steps:
1518
- name: Check out code
16-
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # tag=v3.1.0
19+
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # tag=v3.3.0
20+
with:
21+
ref: ${{ matrix.branch }}
1722
- name: Setup go
1823
uses: actions/setup-go@d0a58c1c4d2b25278816e339b944508c875f3613 # tag=v3.4.0
1924
with:
2025
go-version: 1.19
2126
- name: Run verify container script
22-
run: make verify-container-images
27+
run: make verify-container-images

docs/release/release-tasks.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ This comes down to changing occurrences of the old version to the new version, e
111111
5. Modify the test specs in `test/e2e/clusterctl_upgrade_test.go` (according to the versions we want to test described above).
112112
Please note that `InitWithKubernetesVersion` should be the highest mgmt cluster version supported by the respective Cluster API version.
113113
2. Update `create-local-repository.py` and `tools/tilt-prepare/main.go`: `v1.3.99` => `v1.4.99`.
114-
3. Make sure all tests are green (also run `pull-cluster-api-e2e-full-main` and `pull-cluster-api-e2e-workload-upgrade-1-23-latest-main`).
114+
3. Update `.github/workflows/scan.yml` to setup Trivy scanning for the currently supported branches.
115+
4. Make sure all tests are green (also run `pull-cluster-api-e2e-full-main` and `pull-cluster-api-e2e-workload-upgrade-1-23-latest-main`).
115116

116117
Prior art: https://github.com/kubernetes-sigs/cluster-api/pull/6834/files
117118

0 commit comments

Comments
 (0)