Skip to content

Conversation

@andyzhangx
Copy link
Member

What type of PR is this?
/kind failing-test

What this PR does / why we need it:
test: fix CVE-2025-4673 in trivy action

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

none

@k8s-ci-robot k8s-ci-robot added kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jun 14, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx

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

The pull request process is described here

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 requested a review from cvvz June 14, 2025 01:51
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 14, 2025
@k8s-ci-robot k8s-ci-robot requested a review from feiskyer June 14, 2025 01:51
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 14, 2025
@andyzhangx andyzhangx merged commit 3bcc2ab into kubernetes-sigs:master Jun 14, 2025
16 of 22 checks passed
@andyzhangx
Copy link
Member Author

/cherrypick release-1.26

@andyzhangx
Copy link
Member Author

/cherrypick release-1.25

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #2033

In response to this:

/cherrypick release-1.26

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #2034

In response to this:

/cherrypick release-1.25

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@andyzhangx
Copy link
Member Author

/cherrypick release-1.24

@andyzhangx
Copy link
Member Author

/cherrypick release-1.23

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #2035

In response to this:

/cherrypick release-1.24

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-infra-cherrypick-robot

@andyzhangx: new pull request created: #2036

In response to this:

/cherrypick release-1.23

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@andyzhangx
Copy link
Member Author

/cherrypick release-1.22

@k8s-infra-cherrypick-robot

@andyzhangx: #2032 failed to apply on top of branch "release-1.22":

Applying: test: fix CVE-2025-4673 in trivy action
Using index info to reconstruct a base tree...
M	.github/workflows/trivy.yaml
Falling back to patching base and 3-way merge...
Auto-merging .github/workflows/trivy.yaml
CONFLICT (content): Merge conflict in .github/workflows/trivy.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 test: fix CVE-2025-4673 in trivy action

In response to this:

/cherrypick release-1.22

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

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/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants