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

Always use gcr.io/google_containers for side-loaded Docker images #49066

Merged
merged 1 commit into from Jul 18, 2017
Merged

Always use gcr.io/google_containers for side-loaded Docker images #49066

merged 1 commit into from Jul 18, 2017

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Jul 17, 2017

What this PR does / why we need it: #45391 changed the behavior for what registry we use in the sideloaded docker images tarfiles shipped with releases. As a result of that change, if KUBE_DOCKER_REGISTRY is set to anything other than gcr.io/google_containers, clusters will fail to start on GCE (and other places where the side-loaded images are used).

This PR reverts that change in behavior, which I believe was unintentional; we'll always use gcr.io/google_containers for the docker image tarfiles, but will tag the images with $KUBE_DOCKER_REGISTRY if different.

Also, I'm fixing a small bug in variable names that I introduced in #47939.

Note that with recent changes here and in the release repo, we don't even need to tag with KUBE_DOCKER_REGISTRY and KUBE_DOCKER_IMAGE_TAG, but that's a more extensive change, and this smaller fix is more suitable for cherry-picking to 1.7.

Release note:

NONE

/release-note-none
/sig release
/assign @david-mcmahon

@k8s-ci-robot k8s-ci-robot added sig/release Categorizes an issue or PR as relevant to SIG Release. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 17, 2017
@k8s-github-robot k8s-github-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-none Denotes a PR that doesn't merit a release note. labels Jul 17, 2017
@ixdy
Copy link
Member Author

ixdy commented Jul 17, 2017

x-ref #48956

@david-mcmahon
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 18, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: david-mcmahon, ixdy

Associated issue: 45391

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

@ixdy
Copy link
Member Author

ixdy commented Jul 18, 2017

/retest

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 49043, 49001, 49057, 49066, 48102)

@k8s-github-robot k8s-github-robot merged commit c3fa13a into kubernetes:master Jul 18, 2017
@ixdy ixdy mentioned this pull request Jul 18, 2017
Merged
@ixdy ixdy added this to the v1.7 milestone Jul 18, 2017
@ixdy ixdy mentioned this pull request Jul 18, 2017
Closed
@wojtek-t wojtek-t added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate labels Jul 19, 2017
wojtek-t added a commit that referenced this pull request Jul 19, 2017
@wojtek-t
Merge pull request #49149 from ixdy/automated-cherry-pick-of-#49066-u…
62ddba5 
…pstream-release-1.7

Automated cherry pick of #49066
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.7" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@david-mcmahon david-mcmahon mentioned this pull request Nov 2, 2017
Merged
k8s-github-robot pushed a commit that referenced this pull request Nov 22, 2017
Merge pull request #54963 from david-mcmahon/automated-cherry-pick-of…
6c609fe 
…-#47939-#49066-upstream-release-1.7

Automatic merge from submit-queue.

Automated cherry pick of #47939 #49066

Cherry pick of #47939 #49066 on release-1.7.

#47939: Save docker image tarfiles in _output/release-images/$arch/.
#49066: Always use gcr.io/google_containers for side-loaded Docker
@ixdy ixdy deleted the sideload-docker-tag branch May 15, 2018 23:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@david-mcmahon david-mcmahon

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. sig/release Categorizes an issue or PR as relevant to SIG Release. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.7
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ixdy @david-mcmahon @k8s-github-robot @k8s-cherrypick-bot @wojtek-t @k8s-ci-robot