Remove etcd references from ReplicationController

duda · Mar 13, 2015 · 07cf658 · 07cf658
1 parent 39dceb1
commit 07cf658
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 19 deletions.
diff --git a/pkg/controller/replication_controller.go b/pkg/controller/replication_controller.go
@@ -138,7 +138,7 @@ func (rm *ReplicationManager) watchControllers(resourceVersion *string) {
 		case event, open := <-watching.ResultChan():
 			if !open {
 				// watchChannel has been closed, or something else went
-				// wrong with our etcd watch call. Let the util.Forever()
+				// wrong with our watch call. Let the util.Forever()
 				// that called us call us again.
 				return
 			}

diff --git a/pkg/controller/replication_controller_test.go b/pkg/controller/replication_controller_test.go
@@ -30,10 +30,8 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/tools"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
-	"github.com/coreos/go-etcd/etcd"
 )
 
 func makeNamespaceURL(namespace, suffix string) string {
@@ -250,22 +248,6 @@ func TestSynchronize(t *testing.T) {
 		"type": "production",
 	}
 
-	fakeEtcd := tools.NewFakeEtcdClient(t)
-	fakeEtcd.Data["/registry/controllers"] = tools.EtcdResponseWithError{
-		R: &etcd.Response{
-			Node: &etcd.Node{
-				Nodes: []*etcd.Node{
-					{
-						Value: runtime.EncodeOrDie(testapi.Codec(), &controllerSpec1),
-					},
-					{
-						Value: runtime.EncodeOrDie(testapi.Codec(), &controllerSpec2),
-					},
-				},
-			},
-		},
-	}
-
 	fakePodHandler := util.FakeHandler{
 		StatusCode:   200,
 		ResponseBody: "{\"apiVersion\": \"" + testapi.Version() + "\", \"kind\": \"PodList\"}",