Skip to content

Revert "Merge pull request #31023 from vishh/gci-default"#32913

Merged
k8s-github-robot merged 1 commit intokubernetes:masterfrom
mtaufen:containervm-default-again
Sep 17, 2016
Merged

Revert "Merge pull request #31023 from vishh/gci-default"#32913
k8s-github-robot merged 1 commit intokubernetes:masterfrom
mtaufen:containervm-default-again

Conversation

@mtaufen
Copy link
Copy Markdown
Contributor

@mtaufen mtaufen commented Sep 16, 2016 •
edited by k8s-oncall
Loading

This reverts PR #31023, which had made GCI the default node image for open source. This revert makes container-vm the default for open source again.

This change is Reviewable

@mtaufen
Revert "Merge pull request kubernetes#31023 from vishh/gci-default"
2a536bf 
This reverts PR kubernetes#31023, which had made GCI the default node image for
open source. This revert makes container-vm the default for open source again.
@mtaufen mtaufen added this to the v1.4 milestone Sep 16, 2016
@mtaufen mtaufen added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. area/platform/gce release-note-none Denotes a PR that doesn't merit a release note. area/os/gci sig/node Categorizes an issue or PR as relevant to SIG Node. and removed sig/node Categorizes an issue or PR as relevant to SIG Node. labels Sep 16, 2016
@dchen1107
Copy link
Copy Markdown
Member

dchen1107 commented Sep 16, 2016

LGTM

@dchen1107 dchen1107 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 16, 2016
@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 16, 2016
@pwittrock pwittrock added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Sep 16, 2016
@eparis
Copy link
Copy Markdown
Contributor

eparis commented Sep 16, 2016

Is this what I want in 1.4, and we should remove the candidate label from #32738 ?

@pwittrock
Copy link
Copy Markdown
Member

pwittrock commented Sep 16, 2016

Context for @eparis :

I had a long discussion with Vish and Dawn about this. We are rolling this back because trying to make sure both gci and cvm were well supported in 1.4 was creating an overhead burden on the release process. This should reduce the scope of testing needed for 1.4.

@dchen1107 dchen1107 mentioned this pull request Sep 16, 2016
Merged
@k8s-github-robot
Copy link
Copy Markdown

k8s-github-robot commented Sep 16, 2016

@mtaufen
You must link to the test flake issue which caused you to request this manual re-test.
Re-test requests should be in the form of: k8s-bot test this issue: #<number>
Here is the list of open test flakes.

@pwittrock
Copy link
Copy Markdown
Member

pwittrock commented Sep 16, 2016

@k8s-bot test this issue: #IGNORE

@k8s-bot
Copy link
Copy Markdown

k8s-bot commented Sep 17, 2016

GCE e2e build/test passed for commit 2a536bf.

@k8s-github-robot
Copy link
Copy Markdown

k8s-github-robot commented Sep 17, 2016

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

@k8s-bot
Copy link
Copy Markdown

k8s-bot commented Sep 17, 2016

GCE e2e build/test passed for commit 2a536bf.

@k8s-github-robot
Copy link
Copy Markdown

k8s-github-robot commented Sep 17, 2016

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 3718fd1 into kubernetes:master Sep 17, 2016
eparis pushed a commit to eparis/kubernetes that referenced this pull request Sep 17, 2016
@eparis
Merge pull request kubernetes#32913 from mtaufen/containervm-default-…
20473c8 
…again

Automatic merge from submit-queue

Revert "Merge pull request kubernetes#31023 from vishh/gci-default"

This reverts PR kubernetes#31023, which had made GCI the default node image for open source. This revert makes container-vm the default for open source again.
(cherry picked from commit 3718fd1)
@eparis eparis mentioned this pull request Sep 17, 2016
Merged
@k8s-cherrypick-bot
Copy link
Copy Markdown

k8s-cherrypick-bot commented Sep 17, 2016

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

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@eparis
Merge pull request kubernetes#32913 from mtaufen/containervm-default-…
0644518 
…again

Automatic merge from submit-queue

Revert "Merge pull request kubernetes#31023 from vishh/gci-default"

This reverts PR kubernetes#31023, which had made GCI the default node image for open source. This revert makes container-vm the default for open source again.
(cherry picked from commit 3718fd1)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@vishh vishh

@dchen1107 dchen1107

@pwittrock pwittrock

Labels

area/platform/gce 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. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

v1.4

Development

Successfully merging this pull request may close these issues.

9 participants

@mtaufen @dchen1107 @eparis @pwittrock @k8s-github-robot @k8s-bot @k8s-cherrypick-bot @googlebot @vishh