Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

add default scheme when mirrors no scheme #1450

Merged
merged 1 commit into from
Apr 17, 2020
Merged

add default scheme when mirrors no scheme #1450

merged 1 commit into from
Apr 17, 2020

Conversation

yylt
Copy link
Contributor

@yylt yylt commented Apr 17, 2020 •
edited
Loading

add default scheme on endpoints in mirrors.
It is helpful in containerd/containerd#4108

Signed-off-by: yang yang yang8518296@163.com

@k8s-ci-robot
Copy link

Hi @yylt. Thanks for your PR.

I'm waiting for a containerd 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.

mikebrow
mikebrow approved these changes Apr 17, 2020
View reviewed changes
Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM
on green

@mikebrow
Copy link
Member

/ok-to-test

@mikebrow
Copy link
Member

mikebrow commented Apr 17, 2020 •
edited
Loading

@yylt here's the regex ^Signed-off-by: ([^<]+) <([^<>@]+@[^<>]+)>$
so you just need < > around your email

Is this your real name and a real email? See the contributing guidelines below. We have a requirement to "Use your real name (sorry, no pseudonyms or anonymous contributions.)"

Thank you for the contribution!

mikebrow
mikebrow reviewed Apr 17, 2020
View reviewed changes
pkg/server/image_pull.go Outdated
@@ -385,6 +399,13 @@ func (c *criService) registryEndpoints(host string) ([]string, error) {
if err != nil {
return nil, errors.Wrap(err, "get default host")
}
for i, _ := range endpoints {
Copy link
Member

Choose a reason for hiding this comment

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

lint complains about this one... suggests:
for i := range..

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

@yylt yylt force-pushed the add-scheme-endpoint branch 2 times, most recently from 05e7630 to b41e0a2 Compare April 17, 2020 15:23
@yylt
Copy link
Contributor Author

yylt commented Apr 17, 2020

@yylt here's the regex ^Signed-off-by: ([^<]+) <([^<>@]+@[^<>]+)>$
so you just need < > around your email

Is this your real name and a real email? See the contributing guidelines below. We have a requirement to "Use your real name (sorry, no pseudonyms or anonymous contributions.)"

Thank you for the contribution!

@yylt here's the regex ^Signed-off-by: ([^<]+) <([^<>@]+@[^<>]+)>$
so you just need < > around your email

Is this your real name and a real email? See the contributing guidelines below. We have a requirement to "Use your real name (sorry, no pseudonyms or anonymous contributions.)"

Thank you for the contribution!

all is real

@yylt
add default scheme if endpoint no scheme
d07f7f1 
Signed-off-by: yang yang <yang8518296@163.com>
Zyqsempai
Zyqsempai approved these changes Apr 17, 2020
View reviewed changes
Copy link
Contributor

@Zyqsempai Zyqsempai left a comment

Choose a reason for hiding this comment

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

LGTM

mikebrow
mikebrow approved these changes Apr 17, 2020
View reviewed changes
Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM

@mikebrow mikebrow merged commit c6c9268 into containerd:master Apr 17, 2020
@yylt yylt deleted the add-scheme-endpoint branch April 19, 2020 13:28
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Zyqsempai Zyqsempai Zyqsempai approved these changes

@mikebrow mikebrow mikebrow approved these changes

Assignees
No one assigned
Labels
ok-to-test size/M
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@yylt @k8s-ci-robot @mikebrow @Zyqsempai