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

🌱 Use shellcheck binary instead of self-built docker image #2211

Merged
merged 1 commit into from
Aug 15, 2023

Conversation

chrischdi
Copy link
Member

What this PR does / why we need it:

This PR:

  • replaces the current shellcheck implementation (based on a self-built container image used via docker run) by the solution which is used at https://github.com/kubernetes-sigs/cluster-api.
  • enables to run make lint-shell or make verify-shellcheck on arm based macs.
  • this also adds the verify-shellcheck target for compatibility with CAPI's Makefile.

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

/area ci

@k8s-ci-robot
Copy link
Contributor

@chrischdi: The label(s) area/ci cannot be applied, because the repository doesn't have them.

In response to this:

What this PR does / why we need it:

This PR:

  • replaces the current shellcheck implementation (based on a self-built container image used via docker run) by the solution which is used at https://github.com/kubernetes-sigs/cluster-api.
  • enables to run make lint-shell or make verify-shellcheck on arm based macs.
  • this also adds the verify-shellcheck target for compatibility with CAPI's Makefile.

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

/area ci

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 added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 14, 2023
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 14, 2023
@chrischdi chrischdi changed the title Use shellcheck binary instead of self-built docker image 🌱 Use shellcheck binary instead of self-built docker image Aug 14, 2023
Makefile Outdated Show resolved Hide resolved
@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 15, 2023
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 331eb3fe5fc4f13e83bd28476e2bc7672225de8f

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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

@sbueringer
Copy link
Member

/cherry-pick release-1.8

@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 15, 2023
@k8s-infra-cherrypick-robot

@sbueringer: 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.

@sbueringer
Copy link
Member

/cherry-pick release-1.7

@k8s-infra-cherrypick-robot

@sbueringer: 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.

@sbueringer
Copy link
Member

/cherry-pick release-1.6

@k8s-infra-cherrypick-robot

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

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.

@sbueringer
Copy link
Member

/cherry-pick release-1.5

@k8s-infra-cherrypick-robot

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

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.

@k8s-ci-robot k8s-ci-robot merged commit 957d695 into kubernetes-sigs:main Aug 15, 2023
4 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Aug 15, 2023
@k8s-infra-cherrypick-robot

@sbueringer: new pull request created: #2220

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

@sbueringer: #2211 failed to apply on top of branch "release-1.7":

Applying: Use shellcheck binary instead of self-built docker image
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
Removing hack/tools/shellcheck/Makefile
Removing hack/tools/shellcheck/Dockerfile
Removing hack/match-release-tag.sh
Removing hack/check-shell.sh
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use shellcheck binary instead of self-built docker image
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

@sbueringer: #2211 failed to apply on top of branch "release-1.6":

Applying: Use shellcheck binary instead of self-built docker image
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
Removing hack/tools/shellcheck/Makefile
Removing hack/tools/shellcheck/Dockerfile
Removing hack/match-release-tag.sh
Removing hack/check-shell.sh
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use shellcheck binary instead of self-built docker image
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

@sbueringer: #2211 failed to apply on top of branch "release-1.5":

Applying: Use shellcheck binary instead of self-built docker image
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
Removing hack/tools/shellcheck/Makefile
Removing hack/tools/shellcheck/Dockerfile
Removing hack/match-release-tag.sh
Removing hack/check-shell.sh
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Use shellcheck binary instead of self-built docker image
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.

@chrischdi
Copy link
Member Author

/hold

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

There's not much to hold at this point :)

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
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
chrischdi pushed a commit to chrischdi/cluster-api-provider-vsphere that referenced this pull request Aug 15, 2023
- Align github actions with upstream CAPI kubernetes-sigs#2167
- flavorgen generates all flavors by default kubernetes-sigs#2172
- Use shellcheck binary instead of self-built docker image kubernetes-sigs#2211
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 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. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants