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

Wait for cbr0 configuration to complete before setting up routes. - f… #35308

Merged
merged 1 commit into from
Oct 25, 2016
Merged

Wait for cbr0 configuration to complete before setting up routes. - f… #35308

merged 1 commit into from
Oct 25, 2016

Conversation

kerneltime
Copy link

@kerneltime kerneltime commented Oct 21, 2016 •
edited

Automated cherry pick of #35232 , this is needed for kube-up to work on vSphere, need this in the next 1.4 release.

fixes #34248, #31310

  • Remove optimizations for salt status check till flakyness of install is addressed - fix indentation

This change is Reviewable

Wait for cbr0 configuration to complete before setting up routes. - f…
4ae7d7c 
…ixes kubernetes#34248, kubernetes#31310 - Remove optimizations for salt status check till flakyness of install is addressed - fix indentation
@kerneltime
Copy link
Author

cc @jessfraz @abrarshivani @luomiao @AlainRoy

@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Oct 21, 2016
@jbeda
Copy link
Contributor

jbeda commented Oct 21, 2016

@jessfraz -- the cherrypick process scares and confuses me. Is there anything for me to do here to help review this?

@jessfraz jessfraz added this to the v1.4 milestone Oct 21, 2016
@jessfraz jessfraz added cherrypick-candidate cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. release-note Denotes a PR that will be considered when it comes time to generate release notes. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. release-note-label-needed labels Oct 21, 2016
@k8s-ci-robot
Copy link
Contributor

Jenkins verification failed for commit 4ae7d7c. Full PR test history.

The magic incantation to run this job again is @k8s-bot verify test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@jessfraz
Copy link
Contributor

@k8s-bot verify test this

@k8s-github-robot
Copy link

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

@k8s-ci-robot
Copy link
Contributor

Jenkins GCI GKE smoke e2e failed for commit 4ae7d7c. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-ci-robot
Copy link
Contributor

Jenkins GKE smoke e2e failed for commit 4ae7d7c. Full PR test history.

The magic incantation to run this job again is @k8s-bot cvm gke e2e test this. Please help us cut down flakes by linking to an open flake issue when you hit one in your PR.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 68ba01d into kubernetes:release-1.4 Oct 25, 2016
@k8s-cherrypick-bot
Copy link

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.

@kevtainer kevtainer mentioned this pull request Oct 26, 2016
Closed
@kevtainer
Copy link

kevtainer commented Oct 26, 2016 •
edited

For some reason cbr0 is not being assigned the nodes internal ip. :hurtrealbad:

@kerneltime Okay, there appears to be some regression here. I switched back to the 1.4.4 release, applied this patch, and it works as expected. Perhaps the build failures are related?

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
Merge pull request kubernetes#35308 from vmware/automated-cherry-pick…
78f9cbe 
…-of-#35232-upstream-release-1.4

Automatic merge from submit-queue

Wait for cbr0 configuration to complete before setting up routes. - f…

Automated cherry pick of kubernetes#35232 , this is needed for kube-up to work on vSphere, need this in the next 1.4 release.

fixes kubernetes#34248, kubernetes#31310 
- Remove optimizations for salt status check till flakyness of install is addressed - fix indentation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jbeda jbeda

@jessfraz jessfraz

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 Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.4
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@kerneltime @jbeda @k8s-ci-robot @jessfraz @k8s-github-robot @k8s-cherrypick-bot @kevtainer @googlebot