search

kubernetes-sigs / blob-csi-driver

Azure Blob Storage CSI driver
Apache License 2.0
123 stars 81 forks source link

test: fix trivy action failure #1457

Closed andyzhangx closed 3 months ago

andyzhangx commented 3 months ago

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

What this PR does / why we need it: test: fix trivy action failure

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

none
k8s-ci-robot commented 3 months ago

[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: - ~~[OWNERS](https://github.com/kubernetes-sigs/blob-csi-driver/blob/master/OWNERS)~~ [andyzhangx] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
andyzhangx commented 3 months ago

/cherrypick release-1.23

andyzhangx commented 3 months ago

/cherrypick release-1.22

andyzhangx commented 3 months ago

/cherrypick release-1.21

k8s-infra-cherrypick-robot commented 3 months ago

@andyzhangx: new pull request created: #1459

In response to [this](https://github.com/kubernetes-sigs/blob-csi-driver/pull/1457#issuecomment-2211784329): >/cherrypick release-1.23 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
k8s-infra-cherrypick-robot commented 3 months ago

@andyzhangx: #1457 failed to apply on top of branch "release-1.21":

Applying: test: fix trivy action failure
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
Patch failed at 0001 test: fix trivy action failure
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/kubernetes-sigs/blob-csi-driver/pull/1457#issuecomment-2211784360): >/cherrypick release-1.21 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
k8s-infra-cherrypick-robot commented 3 months ago

@andyzhangx: new pull request created: #1460

In response to [this](https://github.com/kubernetes-sigs/blob-csi-driver/pull/1457#issuecomment-2211784344): >/cherrypick release-1.22 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.