From b8678ad130defc166fa60b06e322b8499b322233 Mon Sep 17 00:00:00 2001 From: Harry Zhang Date: Mon, 16 Jan 2017 16:23:43 +0800 Subject: [PATCH] Use statefulset instead in controller Rename e2e folder to statefulset --- cmd/kube-controller-manager/app/apps.go | 4 ++-- pkg/controller/{petset => statefulset}/BUILD | 0 pkg/controller/{petset => statefulset}/OWNERS | 0 pkg/controller/{petset => statefulset}/fakes.go | 2 +- .../{petset => statefulset}/identity_mappers.go | 2 +- .../identity_mappers_test.go | 2 +- pkg/controller/{petset => statefulset}/iterator.go | 2 +- .../{petset => statefulset}/iterator_test.go | 2 +- .../pet_set.go => statefulset/stateful_set.go} | 2 +- .../stateful_set_test.go} | 2 +- .../stateful_set_utils.go} | 2 +- .../{petset/pet.go => statefulset/statefulpod.go} | 2 +- .../statefulpod_test.go} | 2 +- test/e2e/statefulset.go | 14 +++++++------- .../cockroachdb/service.yaml | 0 .../cockroachdb/statefulset.yaml | 0 .../mysql-galera/service.yaml | 0 .../mysql-galera/statefulset.yaml | 0 .../{petset => statefulset}/redis/service.yaml | 0 .../{petset => statefulset}/redis/statefulset.yaml | 0 .../{petset => statefulset}/zookeeper/service.yaml | 0 .../zookeeper/statefulset.yaml | 0 22 files changed, 19 insertions(+), 19 deletions(-) rename pkg/controller/{petset => statefulset}/BUILD (100%) rename pkg/controller/{petset => statefulset}/OWNERS (100%) rename pkg/controller/{petset => statefulset}/fakes.go (99%) rename pkg/controller/{petset => statefulset}/identity_mappers.go (99%) rename pkg/controller/{petset => statefulset}/identity_mappers_test.go (99%) rename pkg/controller/{petset => statefulset}/iterator.go (99%) rename pkg/controller/{petset => statefulset}/iterator_test.go (99%) rename pkg/controller/{petset/pet_set.go => statefulset/stateful_set.go} (99%) rename pkg/controller/{petset/pet_set_test.go => statefulset/stateful_set_test.go} (99%) rename pkg/controller/{petset/pet_set_utils.go => statefulset/stateful_set_utils.go} (99%) rename pkg/controller/{petset/pet.go => statefulset/statefulpod.go} (99%) rename pkg/controller/{petset/pet_test.go => statefulset/statefulpod_test.go} (99%) rename test/e2e/testing-manifests/{petset => statefulset}/cockroachdb/service.yaml (100%) rename test/e2e/testing-manifests/{petset => statefulset}/cockroachdb/statefulset.yaml (100%) rename test/e2e/testing-manifests/{petset => statefulset}/mysql-galera/service.yaml (100%) rename test/e2e/testing-manifests/{petset => statefulset}/mysql-galera/statefulset.yaml (100%) rename test/e2e/testing-manifests/{petset => statefulset}/redis/service.yaml (100%) rename test/e2e/testing-manifests/{petset => statefulset}/redis/statefulset.yaml (100%) rename test/e2e/testing-manifests/{petset => statefulset}/zookeeper/service.yaml (100%) rename test/e2e/testing-manifests/{petset => statefulset}/zookeeper/statefulset.yaml (100%) diff --git a/cmd/kube-controller-manager/app/apps.go b/cmd/kube-controller-manager/app/apps.go index d95ea4c81b5..6f778f223f4 100644 --- a/cmd/kube-controller-manager/app/apps.go +++ b/cmd/kube-controller-manager/app/apps.go @@ -22,7 +22,7 @@ package app import ( "k8s.io/apimachinery/pkg/runtime/schema" - petset "k8s.io/kubernetes/pkg/controller/petset" + statefulset "k8s.io/kubernetes/pkg/controller/statefulset" ) func startStatefulSetController(ctx ControllerContext) (bool, error) { @@ -30,7 +30,7 @@ func startStatefulSetController(ctx ControllerContext) (bool, error) { return false, nil } resyncPeriod := ResyncPeriod(&ctx.Options)() - go petset.NewStatefulSetController( + go statefulset.NewStatefulSetController( ctx.InformerFactory.Pods().Informer(), ctx.ClientBuilder.ClientOrDie("statefulset-controller"), resyncPeriod, diff --git a/pkg/controller/petset/BUILD b/pkg/controller/statefulset/BUILD similarity index 100% rename from pkg/controller/petset/BUILD rename to pkg/controller/statefulset/BUILD diff --git a/pkg/controller/petset/OWNERS b/pkg/controller/statefulset/OWNERS similarity index 100% rename from pkg/controller/petset/OWNERS rename to pkg/controller/statefulset/OWNERS diff --git a/pkg/controller/petset/fakes.go b/pkg/controller/statefulset/fakes.go similarity index 99% rename from pkg/controller/petset/fakes.go rename to pkg/controller/statefulset/fakes.go index 838de43b6e2..00440683d5e 100644 --- a/pkg/controller/petset/fakes.go +++ b/pkg/controller/statefulset/fakes.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package petset +package statefulset import ( "fmt" diff --git a/pkg/controller/petset/identity_mappers.go b/pkg/controller/statefulset/identity_mappers.go similarity index 99% rename from pkg/controller/petset/identity_mappers.go rename to pkg/controller/statefulset/identity_mappers.go index 39147770310..0c8decb15b1 100644 --- a/pkg/controller/petset/identity_mappers.go +++ b/pkg/controller/statefulset/identity_mappers.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package petset +package statefulset import ( "crypto/md5" diff --git a/pkg/controller/petset/identity_mappers_test.go b/pkg/controller/statefulset/identity_mappers_test.go similarity index 99% rename from pkg/controller/petset/identity_mappers_test.go rename to pkg/controller/statefulset/identity_mappers_test.go index db0f9605782..3eb49c87960 100644 --- a/pkg/controller/petset/identity_mappers_test.go +++ b/pkg/controller/statefulset/identity_mappers_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package petset +package statefulset import ( "fmt" diff --git a/pkg/controller/petset/iterator.go b/pkg/controller/statefulset/iterator.go similarity index 99% rename from pkg/controller/petset/iterator.go rename to pkg/controller/statefulset/iterator.go index 1acecf0b0ea..fc29e920602 100644 --- a/pkg/controller/petset/iterator.go +++ b/pkg/controller/statefulset/iterator.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package petset +package statefulset import ( "fmt" diff --git a/pkg/controller/petset/iterator_test.go b/pkg/controller/statefulset/iterator_test.go similarity index 99% rename from pkg/controller/petset/iterator_test.go rename to pkg/controller/statefulset/iterator_test.go index e59d5e6a664..92e44cb53be 100644 --- a/pkg/controller/petset/iterator_test.go +++ b/pkg/controller/statefulset/iterator_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package petset +package statefulset import ( "fmt" diff --git a/pkg/controller/petset/pet_set.go b/pkg/controller/statefulset/stateful_set.go similarity index 99% rename from pkg/controller/petset/pet_set.go rename to pkg/controller/statefulset/stateful_set.go index 36b98dc913c..09ecc13b799 100644 --- a/pkg/controller/petset/pet_set.go +++ b/pkg/controller/statefulset/stateful_set.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package petset +package statefulset import ( "fmt" diff --git a/pkg/controller/petset/pet_set_test.go b/pkg/controller/statefulset/stateful_set_test.go similarity index 99% rename from pkg/controller/petset/pet_set_test.go rename to pkg/controller/statefulset/stateful_set_test.go index 1bca5811546..59925537ba5 100644 --- a/pkg/controller/petset/pet_set_test.go +++ b/pkg/controller/statefulset/stateful_set_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package petset +package statefulset import ( "fmt" diff --git a/pkg/controller/petset/pet_set_utils.go b/pkg/controller/statefulset/stateful_set_utils.go similarity index 99% rename from pkg/controller/petset/pet_set_utils.go rename to pkg/controller/statefulset/stateful_set_utils.go index 489010b5752..1f3c5714d37 100644 --- a/pkg/controller/petset/pet_set_utils.go +++ b/pkg/controller/statefulset/stateful_set_utils.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package petset +package statefulset import ( "fmt" diff --git a/pkg/controller/petset/pet.go b/pkg/controller/statefulset/statefulpod.go similarity index 99% rename from pkg/controller/petset/pet.go rename to pkg/controller/statefulset/statefulpod.go index 64c7ee3d241..020f677731b 100644 --- a/pkg/controller/petset/pet.go +++ b/pkg/controller/statefulset/statefulpod.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package petset +package statefulset import ( "fmt" diff --git a/pkg/controller/petset/pet_test.go b/pkg/controller/statefulset/statefulpod_test.go similarity index 99% rename from pkg/controller/petset/pet_test.go rename to pkg/controller/statefulset/statefulpod_test.go index f9e6c405a9c..2dda7a7b89b 100644 --- a/pkg/controller/petset/pet_test.go +++ b/pkg/controller/statefulset/statefulpod_test.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package petset +package statefulset import ( "fmt" diff --git a/test/e2e/statefulset.go b/test/e2e/statefulset.go index 113793bac9f..e1554916fa7 100644 --- a/test/e2e/statefulset.go +++ b/test/e2e/statefulset.go @@ -41,7 +41,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/v1" - apss "k8s.io/kubernetes/pkg/apis/apps/v1beta1" + apps "k8s.io/kubernetes/pkg/apis/apps/v1beta1" "k8s.io/kubernetes/pkg/client/clientset_generated/clientset" "k8s.io/kubernetes/pkg/controller/statefulset" "k8s.io/kubernetes/pkg/util/intstr" @@ -472,8 +472,8 @@ var _ = framework.KubeDescribe("StatefulSet", func() { }) func dumpDebugInfo(c clientset.Interface, ns string) { - pl, _ := c.Core().Pods(ns).List(v1.ListOptions{LabelSelector: labels.Everything().String()}) - for _, p := range pl.Items { + sl, _ := c.Core().Pods(ns).List(v1.ListOptions{LabelSelector: labels.Everything().String()}) + for _, s := range sl.Items { desc, _ := framework.RunKubectl("describe", "po", s.Name, fmt.Sprintf("--namespace=%v", ns)) framework.Logf("\nOutput of kubectl describe %v:\n%v", s.Name, desc) @@ -705,7 +705,7 @@ func (s *statefulSetTester) createStatefulSet(manifestPath, ns string) *apps.Sta mkpath := func(file string) string { return filepath.Join(framework.TestContext.RepoRoot, manifestPath, file) } - ss := statefulSetFromManifest(mkpath("statefuleset.yaml"), ns) + ss := statefulSetFromManifest(mkpath("statefulset.yaml"), ns) framework.Logf(fmt.Sprintf("creating " + ss.Name + " service")) framework.RunKubectlOrDie("create", "-f", mkpath("service.yaml"), fmt.Sprintf("--namespace=%v", ns)) @@ -882,8 +882,8 @@ func (s *statefulSetTester) waitForRunning(numStatefulPods int32, ss *apps.State for _, p := range podList.Items { isReady := v1.IsPodReady(&p) desiredReadiness := shouldBeReady == isReady - framework.Logf("Waiting for pod %v to enter %v - Ready=%v, currently %v - Ready=%v", s.Name, v1.PodRunning, shouldBeReady, s.Status.Phase, isReady) - if s.Status.Phase != v1.PodRunning || !desiredReadiness { + framework.Logf("Waiting for pod %v to enter %v - Ready=%v, currently %v - Ready=%v", p.Name, v1.PodRunning, shouldBeReady, p.Status.Phase, isReady) + if p.Status.Phase != v1.PodRunning || !desiredReadiness { return false, nil } } @@ -937,7 +937,7 @@ func (s *statefulSetTester) setHealthy(ss *apps.StatefulSet) { update.Annotations[statefulset.StatefulSetInitAnnotation] = "true" }) framework.ExpectNoError(err) - framework.Logf("Set annotation %v to %v on pod %v", statefulset.StatefulSetInitAnnotation, s.Annotations[statefulset.StatefulSetInitAnnotation], pod.Name) + framework.Logf("Set annotation %v to %v on pod %v", statefulset.StatefulSetInitAnnotation, p.Annotations[statefulset.StatefulSetInitAnnotation], pod.Name) markedHealthyPod = pod.Name } } diff --git a/test/e2e/testing-manifests/petset/cockroachdb/service.yaml b/test/e2e/testing-manifests/statefulset/cockroachdb/service.yaml similarity index 100% rename from test/e2e/testing-manifests/petset/cockroachdb/service.yaml rename to test/e2e/testing-manifests/statefulset/cockroachdb/service.yaml diff --git a/test/e2e/testing-manifests/petset/cockroachdb/statefulset.yaml b/test/e2e/testing-manifests/statefulset/cockroachdb/statefulset.yaml similarity index 100% rename from test/e2e/testing-manifests/petset/cockroachdb/statefulset.yaml rename to test/e2e/testing-manifests/statefulset/cockroachdb/statefulset.yaml diff --git a/test/e2e/testing-manifests/petset/mysql-galera/service.yaml b/test/e2e/testing-manifests/statefulset/mysql-galera/service.yaml similarity index 100% rename from test/e2e/testing-manifests/petset/mysql-galera/service.yaml rename to test/e2e/testing-manifests/statefulset/mysql-galera/service.yaml diff --git a/test/e2e/testing-manifests/petset/mysql-galera/statefulset.yaml b/test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml similarity index 100% rename from test/e2e/testing-manifests/petset/mysql-galera/statefulset.yaml rename to test/e2e/testing-manifests/statefulset/mysql-galera/statefulset.yaml diff --git a/test/e2e/testing-manifests/petset/redis/service.yaml b/test/e2e/testing-manifests/statefulset/redis/service.yaml similarity index 100% rename from test/e2e/testing-manifests/petset/redis/service.yaml rename to test/e2e/testing-manifests/statefulset/redis/service.yaml diff --git a/test/e2e/testing-manifests/petset/redis/statefulset.yaml b/test/e2e/testing-manifests/statefulset/redis/statefulset.yaml similarity index 100% rename from test/e2e/testing-manifests/petset/redis/statefulset.yaml rename to test/e2e/testing-manifests/statefulset/redis/statefulset.yaml diff --git a/test/e2e/testing-manifests/petset/zookeeper/service.yaml b/test/e2e/testing-manifests/statefulset/zookeeper/service.yaml similarity index 100% rename from test/e2e/testing-manifests/petset/zookeeper/service.yaml rename to test/e2e/testing-manifests/statefulset/zookeeper/service.yaml diff --git a/test/e2e/testing-manifests/petset/zookeeper/statefulset.yaml b/test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml similarity index 100% rename from test/e2e/testing-manifests/petset/zookeeper/statefulset.yaml rename to test/e2e/testing-manifests/statefulset/zookeeper/statefulset.yaml