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

Allow to choose image pull commands based on container manager or override them #8380

Merged
merged 1 commit into from
Jan 11, 2022
Merged

Allow to choose image pull commands based on container manager or override them #8380

merged 1 commit into from
Jan 11, 2022

Conversation

sathieu
Copy link
Contributor

@sathieu sathieu commented Jan 6, 2022 •
edited by floryut
Loading

What type of PR is this?

/kind feature

What this PR does / why we need it:

This allow to workaround #8375 by using image_command_tool=crictl
when containerd_registries is used for containerd.

Also changes image_info_command_on_localhost for docker to return digests.

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Allow to choose image pull commands based on container manager or override them

@sathieu
Allow to choose container manager commands
caaf51a 
This allow to workaround kubernetes-sigs#8375 by using image_command_tool=crictl
when containerd_registries is used for containerd.

Also changes image_info_command_on_localhost for docker to return digests.
@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 6, 2022
@k8s-ci-robot
Copy link
Contributor

Hi @sathieu. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 6, 2022
@sathieu sathieu marked this pull request as ready for review January 6, 2022 13:58
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 6, 2022
@sathieu
Copy link
Contributor Author

sathieu commented Jan 6, 2022

@floryut Please review this PR for #8375. This is not a fix, but allow to workaround by forcing crictl with image_command_tool=crictl.

@cristicalin
Copy link
Contributor

I like this approach a lot better then the old format of the code, it seems a lot nicer but please document the use of these new public variables as well since the change is user-facing.

👍

@cristicalin cristicalin mentioned this pull request Jan 9, 2022
Closed
@cristicalin
Copy link
Contributor

/retitle "Allow to choose image pull commands based on container manager or override them"

@k8s-ci-robot k8s-ci-robot changed the title Allow to choose container manager commands "Allow to choose image pull commands based on container manager or override them" Jan 9, 2022
@cristicalin
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 9, 2022
@floryut floryut changed the title "Allow to choose image pull commands based on container manager or override them" Allow to choose image pull commands based on container manager or override them Jan 10, 2022
floryut
floryut approved these changes Jan 10, 2022
View reviewed changes
Copy link
Member

@floryut floryut left a comment •
edited
Loading

Choose a reason for hiding this comment

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

@sathieu This is indeed nicer 👍

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: floryut, sathieu

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 10, 2022
@floryut floryut added kind/container-managers Containers section in the release note kind/feature Categorizes issue or PR as related to a new feature. and removed kind/container-managers Containers section in the release note labels Jan 10, 2022
@sathieu
Copy link
Contributor Author

sathieu commented Jan 10, 2022

I'll work on doc tomorrow.

@oomichi
Copy link
Contributor

oomichi commented Jan 10, 2022

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 10, 2022
@k8s-ci-robot k8s-ci-robot merged commit cfd9873 into kubernetes-sigs:master Jan 11, 2022
@sathieu sathieu mentioned this pull request Jan 11, 2022
Merged
sathieu added a commit to sathieu/kubespray that referenced this pull request Jan 12, 2022
@sathieu
Allow to choose container manager commands (kubernetes-sigs#8380)
6cda67c 
This allow to workaround kubernetes-sigs#8375 by using image_command_tool=crictl
when containerd_registries is used for containerd.

Also changes image_info_command_on_localhost for docker to return digests.

(cherry picked from commit cfd9873)

The cherry-pick was adapted because nerdctl_extra_flags is not in
the release-2.18 branch (kubernetes-sigs#8339).
This was referenced Jan 12, 2022
Closed
Closed
Closed
Merged
k8s-ci-robot pushed a commit that referenced this pull request Jan 17, 2022
@sathieu @k8s-ci-robot
Allow to choose container manager commands (#8380)
7fffe67 
This allow to workaround #8375 by using image_command_tool=crictl
when containerd_registries is used for containerd.

Also changes image_info_command_on_localhost for docker to return digests.

(cherry picked from commit cfd9873)

The cherry-pick was adapted because nerdctl_extra_flags is not in
the release-2.18 branch (#8339).
@sathieu sathieu mentioned this pull request Jan 25, 2022
Closed
This was referenced Apr 5, 2022
Merged
Merged
sakuraiyuta pushed a commit to sakuraiyuta/kubespray that referenced this pull request Apr 16, 2022
@sathieu @sakuraiyuta
Allow to choose container manager commands (kubernetes-sigs#8380)
c6bca31 
This allow to workaround kubernetes-sigs#8375 by using image_command_tool=crictl
when containerd_registries is used for containerd.

Also changes image_info_command_on_localhost for docker to return digests.
@oomichi oomichi mentioned this pull request May 28, 2022
Closed
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Jun 29, 2023
@sathieu @LuckySB
Allow to choose container manager commands (kubernetes-sigs#8380)
e0fa492 
This allow to workaround kubernetes-sigs#8375 by using image_command_tool=crictl
when containerd_registries is used for containerd.

Also changes image_info_command_on_localhost for docker to return digests.
LuckySB pushed a commit to southbridgeio/kubespray that referenced this pull request Oct 20, 2023
@sathieu @LuckySB
Allow to choose container manager commands (kubernetes-sigs#8380)
18b8452 
This allow to workaround kubernetes-sigs#8375 by using image_command_tool=crictl
when containerd_registries is used for containerd.

Also changes image_info_command_on_localhost for docker to return digests.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@floryut floryut floryut approved these changes

@jayonlau jayonlau Awaiting requested review from jayonlau

@oomichi oomichi Awaiting requested review from oomichi

Assignees

@oomichi oomichi

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. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.
5 participants
@sathieu @k8s-ci-robot @cristicalin @oomichi @floryut