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

Regional registries: Hack the manifests! #22571

Merged
merged 1 commit into from
Mar 6, 2016

Conversation

zmerlynn
Copy link
Member

@zmerlynn zmerlynn commented Mar 5, 2016

Allow the gcr.io/google_containers registry to be overridden regionally by just blasting a new KUBE_ADDON_REGISTRY out. Instead of adding every addon to Salt and asking all of the other consumers (Trusty, Juju, Mesos, etc) to change, just script the sed ourselves.

This is probably the 9th grossest thing I've ever done, but it works well, and it works quickly. I kind of wish it didn't.

@k8s-github-robot
Copy link

Labelling this PR as size/M

@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 5, 2016
@k8s-bot
Copy link

k8s-bot commented Mar 5, 2016

GCE e2e build/test failed for commit bb1b58596ee2e5fc0499f2063f4c02b606011ff2.

Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake.

Allow the gcr.io/google_containers registry to be overridden
regionally by just blasting a new KUBE_ADDON_REGISTRY out. Instead of
adding every addon to Salt and asking all of the other consumers
(Trusty, Juju, Mesos, etc) to change, just script the sed ourselves.

This is probably the 9th grossest thing I've ever done, but it works
well, and it works quickly. I kind of wish it didn't.
@zmerlynn zmerlynn force-pushed the regional-registry branch from bb1b585 to 60e1fcc Compare March 5, 2016 04:01
@k8s-bot
Copy link

k8s-bot commented Mar 5, 2016

GCE e2e build/test passed for commit 60e1fcc.

@roberthbailey roberthbailey added cherrypick-candidate lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Mar 6, 2016
@roberthbailey
Copy link
Contributor

/cc @andyzheng0831 -- I think we've done this in a way that won't break trusty, but cc'ing you just so you are aware of what we are changing.

@andyzheng0831
Copy link

@roberthbailey, thanks for heads-up. This won't break our trusty stuff, but the new logic is not supported there automatically. I think what I need to change is very similar to the change of cluster/saltbase/install.sh in this PR, i.e., if ${KUBE_ADDON_REGISTRY} is different from gcr.io/google_containers we use the regional registry. I will make the change by noon of Monday before leaving for offsite.

@andyzheng0831
Copy link

@zmerlynn @roberthbailey , what is the difference between KUBE_DOCKER_REGISTRY and KUBE_ADDON_REGISTRY? If both are set, which one overwrites which?

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Mar 6, 2016

GCE e2e build/test passed for commit 60e1fcc.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

k8s-github-robot pushed a commit that referenced this pull request Mar 6, 2016
@k8s-github-robot k8s-github-robot merged commit bc96422 into kubernetes:master Mar 6, 2016
@zmerlynn
Copy link
Member Author

zmerlynn commented Mar 7, 2016

@andyzheng0831: It's complicated. Neither should overwrite the other. KUBE_DOCKER_REGISTRY should be the relevant variable for the stuff that's built in the release and is currently side-loaded in the server tar, and KUBE_ADDON_REGISTRY is the rest.

@andyzheng0831
Copy link

@zmerlynn , got you. My change follows the same logic as what you explained.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

7 participants