github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-12 13:31:52 +00:00
Code Issues Projects Releases Wiki Activity

Fix up labels on pods so that waitForRCPodsRunning works.

Browse Source
This commit is contained in:
Joe Beda 2015-11-02 09:28:28 -08:00
parent 17e36b02f4
commit 32eafc3c1f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/serviceloadbalancers.go
View File

@ -88,7 +88,7 @@ func (h *haproxyControllerTester) start(namespace string) (err error) {
// Create a replication controller with the given configuration. // Create a replication controller with the given configuration.
rc := rcFromManifest(h.cfg) rc := rcFromManifest(h.cfg)
rc.Namespace = namespace rc.Namespace = namespace
rc.Spec.Template.Labels["rcName"] = rc.Name rc.Spec.Template.Labels["name"] = rc.Name
// Add the --namespace arg. // Add the --namespace arg.
// TODO: Remove this when we have proper namespace support. // TODO: Remove this when we have proper namespace support.
@ -102,7 +102,7 @@ func (h *haproxyControllerTester) start(namespace string) (err error) {
if err != nil { if err != nil {
return return
} }
if err = waitForRCPodsRunning(h.client, namespace, h.rcName); err != nil { if err = waitForRCPodsRunning(h.client, namespace, rc.Name); err != nil {
return return
} }
h.rcName = rc.Name h.rcName = rc.Name
@ -110,7 +110,7 @@ func (h *haproxyControllerTester) start(namespace string) (err error) {
// Find the pods of the rc we just created. // Find the pods of the rc we just created.
labelSelector := labels.SelectorFromSet( labelSelector := labels.SelectorFromSet(
labels.Set(map[string]string{"rcName": h.rcName})) labels.Set(map[string]string{"name": h.rcName}))
pods, err := h.client.Pods(h.rcNamespace).List( pods, err := h.client.Pods(h.rcNamespace).List(
labelSelector, fields.Everything()) labelSelector, fields.Everything())
if err != nil { if err != nil {
@ -164,7 +164,7 @@ func (s *ingManager) start(namespace string) (err error) {
for _, rcPath := range s.rcCfgPaths { for _, rcPath := range s.rcCfgPaths {
rc := rcFromManifest(rcPath) rc := rcFromManifest(rcPath)
rc.Namespace = namespace rc.Namespace = namespace
rc.Spec.Template.Labels["rcName"] = rc.Name rc.Spec.Template.Labels["name"] = rc.Name
rc, err = s.client.ReplicationControllers(rc.Namespace).Create(rc) rc, err = s.client.ReplicationControllers(rc.Namespace).Create(rc)
if err != nil { if err != nil {
return return