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

cleanup: s^gcr.io/google_containers^gcr.io/google-containers/^g #48956

Closed
wants to merge 1 commit into from

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Jul 14, 2017

What this PR does / why we need it: at some point in the distant past, docker did not support hyphens in the registry name, and so we needed to use the google_containers alias (which GCR internally translated) to refer to the google-containers project.

There's no need to use this alias anymore (since docker 1.5, I think), and it causes some developer confusion. Also, some tooling (e.g. certain gcloud subcommands) don't understand the underscore alias of the project.

Special notes for your reviewer: this shouldn't break anything, but I'm still investigating.

I have no idea which sig this falls under.

Release note:

The docker image tarfiles distributed with the release now use the registry gcr.io/google-containers (instead of gcr.io/google_containers).

/release-note

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

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ixdy
We suggest the following additional approver: thockin

Assign the PR to them by writing /assign @thockin in a comment when ready.

No associated issue. Update pull-request body to add a reference to an issue, or get approval with /approve no-issue

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. release-note-none Denotes a PR that doesn't merit a release note. labels Jul 14, 2017
@ixdy
Copy link
Member Author

ixdy commented Jul 14, 2017

anything that goes through the registry should be fine, since GCR handles the aliasing.
the only places I'd worry about incompatibility are when we side-load the images.

@ixdy
Copy link
Member Author

ixdy commented Jul 14, 2017

/test pull-kubernetes-e2e-gke
/test pull-kubernetes-e2e-gke-gci

@ixdy
Copy link
Member Author

ixdy commented Jul 14, 2017

/retest

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 14, 2017
@ixdy ixdy force-pushed the standardize-google-containers branch from 83516e3 to 49c6334 Compare July 14, 2017 23:10
@k8s-github-robot k8s-github-robot added needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 14, 2017
@@ -284,7 +284,7 @@ function kube::release::create_docker_images_for_server() {
local images_dir="${RELEASE_IMAGES}/${arch}"
mkdir -p "${images_dir}"

local docker_registry="${KUBE_DOCKER_REGISTRY:-gcr.io/google-containers}"
Copy link
Contributor

Choose a reason for hiding this comment

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

add a comment if this is special

Copy link
Member Author

Choose a reason for hiding this comment

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

this line is tricky, because it matters for images which are sideloaded, so both sides need to match. I reverted this because I think the kops-aws job side-loads, using gcr.io/google_containers, but then this broke the gce job (which also side-loads) because I didn't revert its config.

additionally, anago explicitly sets this variable, which then may or may not match the side-load config.

Copy link
Member Author

Choose a reason for hiding this comment

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

#49066 should have fixed the anago case. let's see if all of the jobs pass now...

@sttts
Copy link
Contributor

sttts commented Jul 17, 2017

lgtm if the comment for the special case is added

@ixdy ixdy force-pushed the standardize-google-containers branch from 49c6334 to ce34c2e Compare July 17, 2017 23:57
@ixdy ixdy force-pushed the standardize-google-containers branch from ce34c2e to ef420b6 Compare July 18, 2017 00:00
@ixdy ixdy added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Jul 18, 2017
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 18, 2017
@ixdy ixdy force-pushed the standardize-google-containers branch from ef420b6 to d59a6d7 Compare July 18, 2017 22:31
@ixdy
Copy link
Member Author

ixdy commented Jul 18, 2017

kops uses the side-loaded image and hard-codes gcr.io/google_containers. more yak-shaving is needed.

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jul 18, 2017

@ixdy: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
pull-kubernetes-e2e-gke 83516e37c84555a528e39f90bf90bbd7d258a386 link /test pull-kubernetes-e2e-gke
pull-kubernetes-e2e-gke-gci 83516e37c84555a528e39f90bf90bbd7d258a386 link /test pull-kubernetes-e2e-gke-gci
pull-kubernetes-federation-e2e-gce d59a6d7 link /test pull-kubernetes-federation-e2e-gce
pull-kubernetes-e2e-kops-aws d59a6d7 link /test pull-kubernetes-e2e-kops-aws

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@ixdy
Copy link
Member Author

ixdy commented Jul 21, 2017

FYI, I talked with @zmerlynn about this a bit, and I think to solve the side-loading issue I'm going to create a separate PR which adds the metadata.json for each of these side-loaded images as a release artifact, and then consume that in the GCE and kops cluster startup flow to figure out the correct docker registry.

Once that's done, I can come back here and try again.

@k8s-github-robot
Copy link

@ixdy PR needs rebase

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 21, 2017
@k8s-github-robot
Copy link

This PR hasn't been active in 90 days. Closing this PR. Please reopen if you would like to work towards merging this change, if/when the PR is ready for the next round of review.

cc @erictune @ixdy @sttts

You can add 'keep-open' label to prevent this from happening again, or add a comment to keep it open another 90 days

@ixdy ixdy deleted the standardize-google-containers branch May 15, 2018 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants