Skip to content

[release-1.14] ignore two false positive vulns #6866

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Mar 22, 2024
Merged

[release-1.14] ignore two false positive vulns #6866

merged 1 commit into from
Mar 22, 2024

Conversation

SgtCoDFish
Copy link
Member

These were causing the trivy tests to fail.

Kind

/kind bug

Release Note

NONE

@SgtCoDFish
ignore two false positive vulns
c15dc71 
Signed-off-by: Ashley Davis <ashley.davis@venafi.com>
@jetstack-bot jetstack-bot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. labels Mar 21, 2024
@SgtCoDFish
Copy link
Member Author

/cherry-pick release-1.13

@jetstack-bot
Copy link
Contributor

@SgtCoDFish: once the present PR merges, I will cherry-pick it on top of release-1.13 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.13

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/test-infra repository.

@SgtCoDFish
Copy link
Member Author

/cherry-pick release-1.12

@jetstack-bot jetstack-bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 21, 2024
@jetstack-bot
Copy link
Contributor

@SgtCoDFish: once the present PR merges, I will cherry-pick it on top of release-1.12 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.12

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/test-infra repository.

@ThatsMrTalbot
Copy link
Contributor

/lgtm

@jetstack-bot jetstack-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 22, 2024
@SgtCoDFish
Copy link
Member Author

/approve

@jetstack-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: SgtCoDFish

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

@jetstack-bot jetstack-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 22, 2024
@jetstack-bot jetstack-bot merged commit 61e21f7 into cert-manager:release-1.14 Mar 22, 2024
@SgtCoDFish SgtCoDFish deleted the release-1.14-ignorevulns branch March 22, 2024 14:55
@jetstack-bot
Copy link
Contributor

@SgtCoDFish: #6866 failed to apply on top of branch "release-1.13":

Applying: ignore two false positive vulns
Using index info to reconstruct a base tree...
M	.trivyignore
Falling back to patching base and 3-way merge...
Auto-merging .trivyignore
CONFLICT (content): Merge conflict in .trivyignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ignore two false positive vulns
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:

/cherry-pick release-1.13

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/test-infra repository.

@jetstack-bot
Copy link
Contributor

@SgtCoDFish: #6866 failed to apply on top of branch "release-1.12":

Applying: ignore two false positive vulns
Using index info to reconstruct a base tree...
M	.trivyignore
Falling back to patching base and 3-way merge...
Auto-merging .trivyignore
CONFLICT (content): Merge conflict in .trivyignore
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ignore two false positive vulns
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:

/cherry-pick release-1.12

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/test-infra repository.

@SgtCoDFish
Copy link
Member Author

#6868 and #6869 are manual backports

@inteon inteon mentioned this pull request Mar 22, 2024
Closed
@cert-manager-prow cert-manager-prow bot mentioned this pull request May 13, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. dco-signoff: yes Indicates that all commits in the pull request have the valid DCO sign-off message. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@SgtCoDFish @jetstack-bot @ThatsMrTalbot