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

Use Statefulset instead in e2e and controller #39939

Merged
merged 3 commits into from Jan 17, 2017
Merged

Use Statefulset instead in e2e and controller #39939

merged 3 commits into from Jan 17, 2017

Conversation

resouer
Copy link
Contributor

@resouer resouer commented Jan 16, 2017

Quick fix ref: #35534

We should finish the issue to meet v1.6 milestone.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 16, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-github-robot k8s-github-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. release-note-label-needed labels Jan 16, 2017
@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 16, 2017
@k8s-github-robot k8s-github-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jan 17, 2017
@resouer
Copy link
Contributor Author

resouer commented Jan 17, 2017 •
edited

kindly ping @mikedanese, could you please give this a quick review? This is easy to become needs-rebase.

mikedanese
mikedanese reviewed Jan 17, 2017
View reviewed changes
cmd/kube-controller-manager/app/apps.go
@@ -22,15 +22,15 @@ package app

import (
"k8s.io/apimachinery/pkg/runtime/schema"
petset "k8s.io/kubernetes/pkg/controller/petset"
statefulset "k8s.io/kubernetes/pkg/controller/statefulset"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason this import is named?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Emm ... seems not

@k8s-ci-robot
Copy link
Contributor

Jenkins kops AWS e2e failed for commit a88cbdc. Full PR test history. cc @resouer

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

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@resouer
Copy link
Contributor Author

resouer commented Jan 17, 2017

@k8s-bot kops aws e2e test this

@mikedanese
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 17, 2017
@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Jan 17, 2017
@mikedanese mikedanese added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Jan 17, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 34763, 38706, 39939, 40020)

@k8s-github-robot k8s-github-robot merged commit c0a1fa7 into kubernetes:master Jan 17, 2017
@resouer resouer deleted the statefulset branch January 18, 2017 01:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mikedanese mikedanese mikedanese left review comments

Assignees

@mikedanese mikedanese

@janetkuo janetkuo

Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@resouer @k8s-reviewable @k8s-ci-robot @mikedanese @k8s-github-robot @janetkuo