From df6f01892cd35650f1439a2bc4651a97f60eced2 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Mon, 20 Jun 2016 08:29:47 -0400 Subject: [PATCH] Fix Celery-RabbitMQ flake In the following PR: https://github.com/kubernetes/kubernetes/pull/27162 We used ("name": "rabbitmq" / "name": "celery" / "name": "flower") as the label selector. This does not match the definitions in https://github.com/kubernetes/kubernetes/blob/master/examples/celery-rabbitmq/ I've verified this by deploying the service per the README and checking that "kubectl describe po -l component=rabbitmq" works (and that "kubectl describe po -l name=rabbitmq" fails) Fixes #27683 --- test/e2e/examples.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/examples.go b/test/e2e/examples.go index 55ea62d739..fc150a6082 100644 --- a/test/e2e/examples.go +++ b/test/e2e/examples.go @@ -140,7 +140,7 @@ var _ = framework.KubeDescribe("[Feature:Example]", func() { By("starting rabbitmq") framework.RunKubectlOrDie("create", "-f", rabbitmqServiceYaml, nsFlag) framework.RunKubectlOrDie("create", "-f", rabbitmqControllerYaml, nsFlag) - label := labels.SelectorFromSet(labels.Set(map[string]string{"name": "rabbitmq"})) + label := labels.SelectorFromSet(labels.Set(map[string]string{"component": "rabbitmq"})) err := framework.WaitForPodsWithLabelRunning(c, ns, label) Expect(err).NotTo(HaveOccurred()) forEachPod("component", "rabbitmq", func(pod api.Pod) { @@ -152,7 +152,7 @@ var _ = framework.KubeDescribe("[Feature:Example]", func() { By("starting celery") framework.RunKubectlOrDie("create", "-f", celeryControllerYaml, nsFlag) - label = labels.SelectorFromSet(labels.Set(map[string]string{"name": "celery"})) + label = labels.SelectorFromSet(labels.Set(map[string]string{"component": "celery"})) err = framework.WaitForPodsWithLabelRunning(c, ns, label) Expect(err).NotTo(HaveOccurred()) forEachPod("component", "celery", func(pod api.Pod) { @@ -163,7 +163,7 @@ var _ = framework.KubeDescribe("[Feature:Example]", func() { By("starting flower") framework.RunKubectlOrDie("create", "-f", flowerServiceYaml, nsFlag) framework.RunKubectlOrDie("create", "-f", flowerControllerYaml, nsFlag) - label = labels.SelectorFromSet(labels.Set(map[string]string{"name": "flower"})) + label = labels.SelectorFromSet(labels.Set(map[string]string{"component": "flower"})) err = framework.WaitForPodsWithLabelRunning(c, ns, label) Expect(err).NotTo(HaveOccurred()) forEachPod("component", "flower", func(pod api.Pod) {