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.

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

switch to curl for fetching binaries, rework fetching binaries #230

Merged
merged 2 commits into from
Apr 18, 2023
Merged

switch to curl for fetching binaries, rework fetching binaries #230

merged 2 commits into from
Apr 18, 2023

Conversation

BenTheElder
Copy link
Member

@BenTheElder BenTheElder commented Apr 18, 2023 •
edited
Loading

  • rename containerd setup script to better reflect what it does
  • consistently switch to curl for containerd and shellcheck installs (which we have more widely in our CI images and scripts)
  • fold installing shellcheck into main shellcheck script and drop dockerized version in favor of host binaries aligning with other scripts

resolves #226 (comment) (we don't have wget in the infra-tools image, we do however have curl: https://github.com/kubernetes/k8s.io/tree/main/images/k8s-infra#contents)

@BenTheElder
containerd e2e: use curl instead of wget, rename script
13ace9f 
to better reflect usage, we aren't only using this script in CI, unlike the shellcheck script
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Apr 18, 2023
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Apr 18, 2023
@BenTheElder
Copy link
Member Author

BenTheElder commented Apr 18, 2023 •
edited
Loading

oh hmm, well have to update the CI job to stop invoking the shellcheck install script, I guess the easiest thing to do here is leave a stub script until this merges, then drop calling the script and clean it up

@BenTheElder
switch to curl for shellcheck and auto-install locally as well
148a656 
no longer requires docker or shellcheck to develop
@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 Apr 18, 2023
@BenTheElder
Copy link
Member Author

OK, that'll do for now https://prow.k8s.io/view/gs/kubernetes-jenkins/pr-logs/pull/registry.k8s.io/230/pull-registry-shellcheck/1648130127550222336 ✅

@BenTheElder BenTheElder mentioned this pull request Apr 18, 2023
Merged
upodroid
upodroid approved these changes Apr 18, 2023
View reviewed changes
Copy link
Member

@upodroid upodroid left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, upodroid

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 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 18, 2023
@k8s-ci-robot k8s-ci-robot merged commit 74d6875 into kubernetes:main Apr 18, 2023
@BenTheElder BenTheElder deleted the curl branch April 18, 2023 02:58
@BenTheElder
Copy link
Member Author

For some reason the postsubmit didn't trigger despite being configured for all merges ...

@BenTheElder
Copy link
Member Author

Working on subsequent merges https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/post-registry-push-images/1648298079301931008

This was referenced Apr 20, 2023
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@upodroid upodroid upodroid approved these changes

@hh hh Awaiting requested review from hh

@riaankleinhans riaankleinhans Awaiting requested review from riaankleinhans

Assignees

@upodroid upodroid

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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@BenTheElder @k8s-ci-robot @upodroid