Skip to content
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.

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

🌱 Add verify-govulncheck and verify-vulnerabilities targets and integrate to scan action #2174

Merged
merged 1 commit into from
Aug 14, 2023

Conversation

chrischdi
Copy link
Member

What this PR does / why we need it:

Adds:

  • verify-govulncheck target, to scan the code via govulncheck
  • verify-vulnerabilities target which runs ./hack/verify-vulnerabilities.sh
    • Runs make verify-container-images
    • Runs make verify-govulncheck
    • Exit code is 1 if one or both targets report vulnerabilities or errors
  • Use verify-vulnerabilities in scan action instead of verify-container-images

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #2119

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 7, 2023
@chrischdi
Copy link
Member Author

/hold

to track and merge core CAPI PR first: kubernetes-sigs/cluster-api#9144

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Aug 8, 2023
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Aug 14, 2023
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 14, 2023
@sbueringer
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 14, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: b8dd4f60473ffc80cae101c4d902e83121d2793a

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 14, 2023
@sbueringer
Copy link
Member

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 14, 2023
@chrischdi
Copy link
Member Author

/cherry-pick release-1.8

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick release-1.8

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.

@chrischdi
Copy link
Member Author

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot

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

In response to this:

/cherry-pick release-1.7

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.

@chrischdi
Copy link
Member Author

/cherry-pick release-1.6

@sbueringer
Copy link
Member

@killianmuldoon We'll take a closer look tomorrow, but it looks like we have an issue with the CI env

@sbueringer
Copy link
Member

sbueringer commented Aug 14, 2023

To unblock this PR (and because it doesn't have any impact on e2e). Let's try

/override pull-cluster-api-provider-vsphere-e2e-main

@k8s-ci-robot
Copy link
Contributor

@sbueringer: Overrode contexts on behalf of sbueringer: pull-cluster-api-provider-vsphere-e2e-main

In response to this:

To unblock this PR. Let's try

/override pull-cluster-api-provider-vsphere-e2e-main

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.

@k8s-ci-robot k8s-ci-robot merged commit 2fb4fd7 into kubernetes-sigs:main Aug 14, 2023
5 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Aug 14, 2023
@k8s-infra-cherrypick-robot

@chrischdi: new pull request created: #2214

In response to this:

/cherry-pick release-1.8

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.

@k8s-infra-cherrypick-robot

@chrischdi: #2174 failed to apply on top of branch "release-1.7":

Applying: Add verify-govulncheck target and integrate to scan action
Using index info to reconstruct a base tree...
A	.github/workflows/weekly-image-scan.yaml
M	Makefile
A	docs/release/release-tasks.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): docs/release/release-tasks.md deleted in HEAD and modified in Add verify-govulncheck target and integrate to scan action. Version Add verify-govulncheck target and integrate to scan action of docs/release/release-tasks.md left in tree.
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
CONFLICT (rename/delete): .github/workflows/weekly-image-scan.yaml deleted in Add verify-govulncheck target and integrate to scan action and renamed to .github/workflows/scan.yaml in HEAD. Version HEAD of .github/workflows/scan.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add verify-govulncheck target and integrate to scan action
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.7

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.

@k8s-infra-cherrypick-robot

@chrischdi: #2174 failed to apply on top of branch "release-1.6":

Applying: Add verify-govulncheck target and integrate to scan action
Using index info to reconstruct a base tree...
A	.github/workflows/weekly-image-scan.yaml
M	Makefile
A	docs/release/release-tasks.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): docs/release/release-tasks.md deleted in HEAD and modified in Add verify-govulncheck target and integrate to scan action. Version Add verify-govulncheck target and integrate to scan action of docs/release/release-tasks.md left in tree.
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
CONFLICT (rename/delete): .github/workflows/weekly-image-scan.yaml deleted in Add verify-govulncheck target and integrate to scan action and renamed to .github/workflows/scan.yaml in HEAD. Version HEAD of .github/workflows/scan.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add verify-govulncheck target and integrate to scan action
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.6

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.

@k8s-infra-cherrypick-robot

@chrischdi: #2174 failed to apply on top of branch "release-1.5":

Applying: Add verify-govulncheck target and integrate to scan action
Using index info to reconstruct a base tree...
A	.github/workflows/weekly-image-scan.yaml
M	Makefile
A	docs/release/release-tasks.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): docs/release/release-tasks.md deleted in HEAD and modified in Add verify-govulncheck target and integrate to scan action. Version Add verify-govulncheck target and integrate to scan action of docs/release/release-tasks.md left in tree.
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
CONFLICT (rename/delete): .github/workflows/weekly-image-scan.yaml deleted in Add verify-govulncheck target and integrate to scan action and renamed to .github/workflows/scan.yaml in HEAD. Version HEAD of .github/workflows/scan.yaml left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add verify-govulncheck target and integrate to scan action
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.5

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.

@sbueringer
Copy link
Member

@chrischdi Some cherry-picking for you :)

chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 16, 2023
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
@chrischdi chrischdi deleted the pr-govulncheck branch August 16, 2023 06:20
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 16, 2023
- Add args to golangci-lint to show lines number kubernetes-sigs#2180
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
  - only CI parts
- Add verify-govulncheck target and integrate to scan action kubernetes-sigs#2174
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
- Add doctoc and generate + verify targets kubernetes-sigs#2147
  - only CI parts
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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.

Integrate govulncheck
5 participants