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

pin GCI version to milestone 52 #26582

Merged
merged 1 commit into from
Jun 3, 2016
Merged

pin GCI version to milestone 52 #26582

merged 1 commit into from
Jun 3, 2016

Conversation

adityakali
Copy link
Contributor

@adityakali adityakali commented May 31, 2016 •
edited
Loading

This is mainly for pinning the 1.2 branch to GCI milestone 52
which contains correct docker and kubelet built in.
Doing this allows us to upgrade docker to v1.11 (issue #26455)
in GCI 53 without breaking the 1.2 release branch.

@kubernetes/goog-image @dchen1107 @roberthbailey @andyzheng0831

@andyzheng0831 andyzheng0831 added this to the v1.2 milestone May 31, 2016
@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels May 31, 2016
@adityakali
Copy link
Contributor Author

Hold on with the lgtm label. I need to make some edits.

@andyzheng0831 andyzheng0831 added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels May 31, 2016
@adityakali
Copy link
Contributor Author

Updated the patch. PTAL.
Thanks @Amey-D for suggesting a better fix.

@roberthbailey
Copy link
Contributor

@adityakali github says that your branch has conflicts, but the bot hasn't applied the needs-rebase label. Can you take a look?

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 2, 2016
@adityakali
pin GCI version to milestone 52
f7c2624 
This is mainly for pinning the 1.2 branch to GCI milestone 52
which contains correct docker and kubelet built in.
Doing this allows us to upgrade docker to v1.11 (issue kubernetes#26455)
in GCI 53 without breaking the 1.2 release branch.
@adityakali
Copy link
Contributor Author

Rebased. PTAL.

@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 2, 2016
@adityakali
Copy link
Contributor Author

@k8s-bot test this issue #23545

@andyzheng0831 andyzheng0831 mentioned this pull request Jun 2, 2016
Merged
@roberthbailey roberthbailey added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 2, 2016
@adityakali
Copy link
Contributor Author

The failure is again the same "gcloud crashed" error (issue #23545) which seems to be reported fixed just now.

@adityakali
Copy link
Contributor Author

@k8s-bot test this issue #23545

@k8s-bot
Copy link

k8s-bot commented Jun 2, 2016

GCE e2e build/test passed for commit f7c2624.

@andyzheng0831
Copy link

According to #26741 (comment) I guess I should set the milestone to 1.3 instead of 1.2

@andyzheng0831 andyzheng0831 modified the milestones: v1.3, v1.2 Jun 3, 2016
@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 Jun 3, 2016

GCE e2e build/test passed for commit f7c2624.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 1ad3e11 into kubernetes:master Jun 3, 2016
@andyzheng0831
Copy link

@adityakali please follow https://github.com/kubernetes/kubernetes/blob/master/docs/devel/cherry-picks.md to make a cherry-pick for release-1.2 branch

@adityakali adityakali deleted the ark.docker1.11 branch June 3, 2016 22:38
@adityakali adityakali restored the ark.docker1.11 branch June 3, 2016 22:39
@adityakali adityakali mentioned this pull request Jun 3, 2016
Merged
@roberthbailey roberthbailey modified the milestones: v1.2, v1.3 Jun 4, 2016
@roberthbailey roberthbailey added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Jun 4, 2016
roberthbailey added a commit that referenced this pull request Jun 6, 2016
@roberthbailey
Merge pull request #26826 from adityakali/automated-cherry-pick-of-#2…
c51fe37 
…6582-kube-release-1.2

Automated cherry pick of #26582
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@roberthbailey
Merge pull request kubernetes#26826 from adityakali/automated-cherry-…
3e8737b 
…pick-of-#26582-kube-release-1.2

Automated cherry pick of kubernetes#26582
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@roberthbailey
Merge pull request kubernetes#26826 from adityakali/automated-cherry-…
124a585 
…pick-of-#26582-kube-release-1.2

Automated cherry pick of kubernetes#26582
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@roberthbailey roberthbailey

Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.
6 participants
@adityakali @roberthbailey @k8s-bot @andyzheng0831 @k8s-github-robot @googlebot