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

add registryMirrors #2893

Merged
merged 1 commit into from
Jul 13, 2017
Merged

add registryMirrors #2893

merged 1 commit into from
Jul 13, 2017

Conversation

qqshfox
Copy link
Contributor

@qqshfox qqshfox commented Jul 10, 2017

Since the network access to the official registry is quite slow in China, we usually use a mirror instead. But currently there is no way to set this options.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 10, 2017
@k8s-ci-robot
Copy link
Contributor

Hi @qqshfox. Thanks for your PR.

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

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. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 10, 2017
@chrislovecnm
Copy link
Contributor

The PR that I have open for self hosting all the assets will assist with this. You will be able to point to which ever repo you want for either binaries or containers.
#2573

I am currently refactoring it based on another pr that will come in first.

@qqshfox
Copy link
Contributor Author

qqshfox commented Jul 10, 2017

@chrislovecnm not only will the mirrors benefit the cluster provisioning but also all the images pulling for any pods. I think it's different purpose with the PR you mentioned.

chrislovecnm
chrislovecnm suggested changes Jul 12, 2017
View reviewed changes
Copy link
Contributor

@chrislovecnm chrislovecnm left a comment

Choose a reason for hiding this comment

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

Looks great! A few comments:

Please provide:

  • documentation, you can include examples in cluster spec document.
  • code level docs on Registry Mirrors
  • I think we have docker unit tests, so please update the test, or file and issue to provide a test later on.

Open questions:

How have you tested this? Which k8s versions?

Appreciate the PR as always!

pkg/apis/kops/v1alpha1/dockerconfig.go Outdated
InsecureRegistry *string `json:"insecureRegistry,omitempty" flag:"insecure-registry"`
MTU *int32 `json:"mtu,omitempty" flag:"mtu"`
InsecureRegistry *string `json:"insecureRegistry,omitempty" flag:"insecure-registry"`
RegistryMirrors []string `json:"registryMirrors,omitempty" flag:"registry-mirror,repeat"`
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we get code level documentation for this?

@chrislovecnm
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jul 12, 2017
@qqshfox
Copy link
Contributor Author

qqshfox commented Jul 13, 2017 •
edited
Loading

  • documentation, you can include examples in cluster spec document.

Done.

  • code level docs on Registry Mirrors

Done.

  • I think we have docker unit tests, so please update the test, or file and issue to provide a test later on.

Added a test to populatecluster_test.go.

How have you tested this? Which k8s versions?

Yes. On v1.6.2.

@qqshfox qqshfox force-pushed the registry_mirrors branch from 7bf86ef to fee6735 Compare July 13, 2017 02:30
@justinsb justinsb self-assigned this Jul 13, 2017
justinsb
justinsb approved these changes Jul 13, 2017
View reviewed changes
Copy link
Member

@justinsb justinsb left a comment

Choose a reason for hiding this comment

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

LGTM

@justinsb
Copy link
Member

LGTM, and this is the approach used in GCE kube-up (for example): https://github.com/kubernetes/kubernetes/blob/8316bbc14ce822ae8de6707a71396fb58dafe1f1/cluster/gce/configure-vm.sh#L786

@justinsb justinsb merged commit d058133 into kubernetes:master Jul 13, 2017
@justinsb
Copy link
Member

Thanks @qqshfox

@qqshfox qqshfox deleted the registry_mirrors branch July 15, 2017 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@chrislovecnm chrislovecnm chrislovecnm requested changes

@justinsb justinsb justinsb approved these changes

Assignees

@justinsb justinsb

Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@qqshfox @k8s-ci-robot @chrislovecnm @justinsb