github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #27717 from dims/fix-issue-27683 

Automatic merge from submit-queue

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
pull/6/head
k8s-merge-robot 2016-06-20 11:48:33 -07:00 committed by GitHub
parent a19728c3a1 df6f01892c
commit b0816b19d3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/examples.go
View File

@ -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) {