Trusty: fix breakage by #26413 and #26109 #26599
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
andyzheng0831
added
the
release-note-none
k8s-github-robot
added
the
size/S
andyzheng0831
referenced
this pull request
Jun 1, 2016
zmerlynn
added
lgtm
k8s-github-robot
added
the
needs-rebase
k8s-github-robot
removed
lgtm
zmerlynn
added
the
lgtm
|
I add "e2e-not-required" as the change in this PR is not covered by default e2e tests. |
|
GCE e2e build/test failed for commit 9a413b3. Please reference the list of currently known flakes when examining this failure. If you request a re-test, you must reference the issue describing the flake. |
|
Automatic merge from submit-queue |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The code https://github.com/kubernetes/kubernetes/tree/master/cluster/gce/trusty in both master and release-1.2 branches is broken. Although we already switched to using cluster/gce/gci for 1.3 branch, we will still need to maintain the cluster/gce/trusty code as long as release-1.2 branch is not deprecated. I will make a couple of PR and cherry-picks to make cluster/gce/trusty back to normal. This PR is one of them, which will not be cherry picked to release-1.2.
@roberthbailey @dchen1107 @fabioy @zmerlynn
cc/ @kubernetes/goog-image