Skip to content

Copy trivy definition from release-tools#390

Merged
k8s-ci-robot merged 3 commits intokubernetes-csi:masterfrom
jsafrane:trivy-parse-go
Nov 21, 2025
Merged

Copy trivy definition from release-tools#390
k8s-ci-robot merged 3 commits intokubernetes-csi:masterfrom
jsafrane:trivy-parse-go

Conversation

@jsafrane
Copy link
Copy Markdown
Contributor

@jsafrane jsafrane commented Nov 21, 2025

What type of PR is this?
/kind feature

What this PR does / why we need it:
Copy trivy definition from release-tools. Only change the path to prow.sh (it's release-tools/prow.sh here).

Update release-tools to get go 1.24.9 to silence the latest CVE alerts.

Goal: trivy should parse go version from prow.sh, so it uses the same version as our image builds. And we need to update only release-tools to silence any new alerts. We don't need to update trivy.yaml any longer.

NONE

8d1258c Merge pull request kubernetes-csi#286 from kubernetes-csi/dependabot/github_actions/actions/checkout-6
91e3598 Bump actions/checkout from 5 to 6
2941381 Merge pull request kubernetes-csi#285 from andyzhangx/patch-6
fa8b339 fix: upgrade to go1.24.9 to fix CVEs

git-subtree-dir: release-tools
git-subtree-split: 8d1258c
Only modify path to release-tools dir.

Goal: parse go version from release-tools, so trivy uses the same go as our image builds.
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/feature Categorizes issue or PR as related to a new feature. labels Nov 21, 2025
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 21, 2025
@jsafrane
Copy link
Copy Markdown
Contributor Author

I can see trivy uses 1.24.9 without the string 1.24.9 anywhere in trivy.yaml:

Running Trivy with options: trivy image golang:1.24.9

Copy link
Copy Markdown
Member

@andyzhangx andyzhangx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 21, 2025
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, jsafrane

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit e739fb6 into kubernetes-csi:master Nov 21, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants