Remove unused and not completely correct code

duda · Aug 16, 2014 · 26e2256 · 26e2256
1 parent 12a22db
commit 26e2256
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 640 deletions.
diff --git a/cmd/apiserver/apiserver.go b/cmd/apiserver/apiserver.go
@@ -71,6 +71,10 @@ func main() {
 	verflag.PrintAndExitIfRequested()
 	verifyMinionFlags()
 
+	if len(etcdServerList) == 0 {
+		glog.Fatalf("-etcd_servers flag is required.")
+	}
+
 	var cloud cloudprovider.Interface
 	switch *cloudProvider {
 	case "gce":
@@ -94,26 +98,16 @@ func main() {
 
 	client := client.New("http://"+net.JoinHostPort(*address, strconv.Itoa(int(*port))), nil)
 
-	var m *master.Master
-	if len(etcdServerList) > 0 {
-		m = master.New(&master.Config{
-			Client:             client,
-			Cloud:              cloud,
-			EtcdServers:        etcdServerList,
-			HealthCheckMinions: *healthCheckMinions,
-			Minions:            machineList,
-			MinionCacheTTL:     *minionCacheTTL,
-			MinionRegexp:       *minionRegexp,
-			PodInfoGetter:      podInfoGetter,
-		})
-	} else {
-		m = master.NewMemoryServer(&master.Config{
-			Client:        client,
-			Cloud:         cloud,
-			Minions:       machineList,
-			PodInfoGetter: podInfoGetter,
-		})
-	}
+	m := master.New(&master.Config{
+		Client:             client,
+		Cloud:              cloud,
+		EtcdServers:        etcdServerList,
+		HealthCheckMinions: *healthCheckMinions,
+		Minions:            machineList,
+		MinionCacheTTL:     *minionCacheTTL,
+		MinionRegexp:       *minionRegexp,
+		PodInfoGetter:      podInfoGetter,
+	})
 
 	storage, codec := m.API_v1beta1()
 	s := &http.Server{

diff --git a/pkg/master/master.go b/pkg/master/master.go
@@ -28,7 +28,6 @@ import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/controller"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/endpoint"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/etcd"
-	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/memory"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/minion"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/pod"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/service"
@@ -61,19 +60,6 @@ type Master struct {
 	client             *client.Client
 }
 
-// NewMemoryServer returns a new instance of Master backed with memory (not etcd).
-func NewMemoryServer(c *Config) *Master {
-	m := &Master{
-		podRegistry:        memory.NewRegistry(),
-		controllerRegistry: memory.NewRegistry(),
-		serviceRegistry:    memory.NewRegistry(),
-		minionRegistry:     minion.NewRegistry(c.Minions),
-		client:             c.Client,
-	}
-	m.init(c.Cloud, c.PodInfoGetter)
-	return m
-}
-
 // New returns a new instance of Master connected to the given etcdServer.
 func New(c *Config) *Master {
 	etcdClient := goetcd.NewClient(c.EtcdServers)

diff --git a/pkg/registry/memory/memory.go b/pkg/registry/memory/memory.go