Skip to content

Revert "Revert "GCI: add support for network plugin""#27371

Merged
k8s-github-robot merged 1 commit intokubernetes:masterfrom
andyzheng0831:network-plugin
Jun 17, 2016
Merged

Revert "Revert "GCI: add support for network plugin""#27371
k8s-github-robot merged 1 commit intokubernetes:masterfrom
andyzheng0831:network-plugin

Conversation

@andyzheng0831
Copy link
Copy Markdown

PR #27027 added the network plugin support in GCI config, but later a bug in the network plugin broke e2e tests (see issue #27118). The bug was fixed by #27141 and we have been repeatedly run the serial e2e tests more than 10 times to verify the fix. Now it should be safe to put the GCI network plugin support back.

We will first merge in the master branch and monitor the Jenkins serial tests for a while and then cherry-pick it into release-1.3 branch.

@andyzheng0831 andyzheng0831 added release-note-none Denotes a PR that doesn't merit a release note. area/os/gci labels Jun 14, 2016
@andyzheng0831 andyzheng0831 self-assigned this Jun 14, 2016
@k8s-github-robot k8s-github-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 14, 2016
@dchen1107 dchen1107 added this to the v1.3 milestone Jun 14, 2016
@andyzheng0831
Copy link
Copy Markdown
Author

cc/ @yujuhong @kubernetes/goog-image @roberthbailey @fabioy FYI

@dchen1107 dchen1107 added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Jun 14, 2016
@dchen1107
Copy link
Copy Markdown
Member

LGTM but want @freehan take another look. Thanks!

@freehan freehan added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 14, 2016
@freehan
Copy link
Copy Markdown
Contributor

freehan commented Jun 14, 2016

LGTM. Thanks!

@yujuhong
Copy link
Copy Markdown
Contributor

LGTM but @freehan we need your tests to prevent regression! ;)

@roberthbailey
Copy link
Copy Markdown
Contributor

We will first merge in the master branch and monitor the Jenkins serial tests for a while and then cherry-pick it into release-1.3 branch.

FYI, for at least the next couple of days, we will be taking everything from the master branch and automatically putting it into the 1.3 release branch. Then, until the 1.3.0 release we will be batch cherry picking changes into the release branch. After the .0 release we will go back to individual cherry picks.

@freehan
Copy link
Copy Markdown
Contributor

freehan commented Jun 17, 2016

@k8s-bot test this issue: #27498

@k8s-bot
Copy link
Copy Markdown

k8s-bot commented Jun 17, 2016

GCE e2e build/test passed for commit e6b744c.

@k8s-github-robot
Copy link
Copy Markdown

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

@k8s-bot
Copy link
Copy Markdown

k8s-bot commented Jun 17, 2016

GCE e2e build/test passed for commit e6b744c.

@k8s-github-robot
Copy link
Copy Markdown

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 2266c4e into kubernetes:master Jun 17, 2016
@andyzheng0831 andyzheng0831 deleted the network-plugin branch June 21, 2016 00:14
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. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. 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.

8 participants