Remove unused members

pkg/master/master.go

@@ -62,7 +62,6 @@ import (
 	namespaceetcd "k8s.io/kubernetes/pkg/registry/namespace/etcd"
 	pvetcd "k8s.io/kubernetes/pkg/registry/persistentvolume/etcd"
 	pvcetcd "k8s.io/kubernetes/pkg/registry/persistentvolumeclaim/etcd"
-	"k8s.io/kubernetes/pkg/registry/pod"
 	podetcd "k8s.io/kubernetes/pkg/registry/pod/etcd"
 	podtemplateetcd "k8s.io/kubernetes/pkg/registry/podtemplate/etcd"
 	resourcequotaetcd "k8s.io/kubernetes/pkg/registry/resourcequota/etcd"
@@ -429,7 +428,6 @@ func (m *Master) init(c *Config) {
 	healthzChecks := []healthz.HealthzChecker{}
 	m.clock = util.RealClock{}
 	podStorage := podetcd.NewStorage(c.DatabaseStorage, c.KubeletClient)
-	podRegistry := pod.NewRegistry(podStorage.Pod)
 
 	podTemplateStorage := podtemplateetcd.NewREST(c.DatabaseStorage)
 
@@ -452,7 +450,7 @@ func (m *Master) init(c *Config) {
 	m.nodeRegistry = minion.NewRegistry(nodeStorage)
 
 	// TODO: split me up into distinct storage registries
-	registry := etcd.NewRegistry(c.DatabaseStorage, podRegistry, m.endpointRegistry)
+	registry := etcd.NewRegistry(c.DatabaseStorage, m.endpointRegistry)
 	m.serviceRegistry = registry
 
 	var serviceClusterIPRegistry service.RangeRegistry
@@ -490,7 +488,7 @@ func (m *Master) init(c *Config) {
 		"podTemplates": podTemplateStorage,
 
 		"replicationControllers": controllerStorage,
-		"services":               service.NewStorage(m.serviceRegistry, m.nodeRegistry, m.endpointRegistry, serviceClusterIPAllocator, serviceNodePortAllocator, c.ClusterName),
+		"services":               service.NewStorage(m.serviceRegistry, m.endpointRegistry, serviceClusterIPAllocator, serviceNodePortAllocator),
 		"endpoints":              endpointsStorage,
 		"nodes":                  nodeStorage,
 		"nodes/status":           nodeStatusStorage,

pkg/registry/etcd/etcd.go

@@ -25,7 +25,6 @@ import (
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/registry/endpoint"
-	"k8s.io/kubernetes/pkg/registry/pod"
 	"k8s.io/kubernetes/pkg/storage"
 	"k8s.io/kubernetes/pkg/watch"
 )
@@ -45,15 +44,13 @@ const (
 // MinionRegistry, PodRegistry and ServiceRegistry, backed by etcd.
 type Registry struct {
 	storage.Interface
-	pods      pod.Registry
 	endpoints endpoint.Registry
 }
 
 // NewRegistry creates an etcd registry.
-func NewRegistry(storage storage.Interface, pods pod.Registry, endpoints endpoint.Registry) *Registry {
+func NewRegistry(storage storage.Interface, endpoints endpoint.Registry) *Registry {
 	registry := &Registry{
 		Interface: storage,
-		pods:      pods,
 		endpoints: endpoints,
 	}
 	return registry

pkg/registry/etcd/etcd_test.go

@@ -28,8 +28,6 @@ import (
 	"k8s.io/kubernetes/pkg/registry/endpoint"
 	endpointetcd "k8s.io/kubernetes/pkg/registry/endpoint/etcd"
 	etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd"
-	"k8s.io/kubernetes/pkg/registry/pod"
-	podetcd "k8s.io/kubernetes/pkg/registry/pod/etcd"
 	"k8s.io/kubernetes/pkg/runtime"
 	etcdstorage "k8s.io/kubernetes/pkg/storage/etcd"
 	"k8s.io/kubernetes/pkg/tools"
@@ -40,15 +38,14 @@ import (
 
 func NewTestEtcdRegistry(client tools.EtcdClient) *Registry {
 	storage := etcdstorage.NewEtcdStorage(client, latest.Codec, etcdtest.PathPrefix())
-	registry := NewRegistry(storage, nil, nil)
+	registry := NewRegistry(storage, nil)
 	return registry
 }
 
 func NewTestEtcdRegistryWithPods(client tools.EtcdClient) *Registry {
 	etcdStorage := etcdstorage.NewEtcdStorage(client, latest.Codec, etcdtest.PathPrefix())
-	podStorage := podetcd.NewStorage(etcdStorage, nil)
 	endpointStorage := endpointetcd.NewStorage(etcdStorage)
-	registry := NewRegistry(etcdStorage, pod.NewRegistry(podStorage.Pod), endpoint.NewRegistry(endpointStorage))
+	registry := NewRegistry(etcdStorage, endpoint.NewRegistry(endpointStorage))
 	return registry
 }
 

pkg/registry/pod/etcd/etcd.go

@@ -80,13 +80,10 @@ func NewStorage(s storage.Interface, k client.ConnectionInfoGetter) PodStorage {
 	}
 	statusStore := *store
 
-	bindings := &podLifecycle{}
 	store.CreateStrategy = pod.Strategy
 	store.UpdateStrategy = pod.Strategy
-	store.AfterUpdate = bindings.AfterUpdate
 	store.DeleteStrategy = pod.Strategy
 	store.ReturnDeletedObject = true
-	store.AfterDelete = bindings.AfterDelete
 
 	statusStore.UpdateStrategy = pod.StatusStrategy
 
@@ -181,16 +178,6 @@ func (r *BindingREST) assignPod(ctx api.Context, podID string, machine string, a
 	return
 }
 
-type podLifecycle struct{}
-
-func (h *podLifecycle) AfterUpdate(obj runtime.Object) error {
-	return nil
-}
-
-func (h *podLifecycle) AfterDelete(obj runtime.Object) error {
-	return nil
-}
-
 // StatusREST implements the REST endpoint for changing the status of a pod.
 type StatusREST struct {
 	store *etcdgeneric.Etcd

pkg/registry/service/rest.go

@@ -32,7 +32,6 @@ import (
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/registry/endpoint"
-	"k8s.io/kubernetes/pkg/registry/minion"
 	"k8s.io/kubernetes/pkg/registry/service/ipallocator"
 	"k8s.io/kubernetes/pkg/registry/service/portallocator"
 	"k8s.io/kubernetes/pkg/runtime"
@@ -44,23 +43,19 @@ import (
 // REST adapts a service registry into apiserver's RESTStorage model.
 type REST struct {
 	registry         Registry
-	machines         minion.Registry
 	endpoints        endpoint.Registry
 	serviceIPs       ipallocator.Interface
 	serviceNodePorts portallocator.Interface
-	clusterName      string
 }
 
 // NewStorage returns a new REST.
-func NewStorage(registry Registry, machines minion.Registry, endpoints endpoint.Registry, serviceIPs ipallocator.Interface,
+func NewStorage(registry Registry, endpoints endpoint.Registry, serviceIPs ipallocator.Interface,
-	serviceNodePorts portallocator.Interface, clusterName string) *REST {
+	serviceNodePorts portallocator.Interface) *REST {
 	return &REST{
 		registry:         registry,
-		machines:         machines,
 		endpoints:        endpoints,
 		serviceIPs:       serviceIPs,
 		serviceNodePorts: serviceNodePorts,
-		clusterName:      clusterName,
 	}
 }
 

pkg/registry/service/rest_test.go

@@ -35,17 +35,15 @@ import (
 
 func NewTestREST(t *testing.T, endpoints *api.EndpointsList) (*REST, *registrytest.ServiceRegistry) {
 	registry := registrytest.NewServiceRegistry()
-	machines := []string{"foo", "bar", "baz"}
 	endpointRegistry := &registrytest.EndpointRegistry{
 		Endpoints: endpoints,
 	}
-	nodeRegistry := registrytest.NewMinionRegistry(machines, api.NodeResources{})
 	r := ipallocator.NewCIDRRange(makeIPNet(t))
 
 	portRange := util.PortRange{Base: 30000, Size: 1000}
 	portAllocator := portallocator.NewPortAllocator(portRange)
 
-	storage := NewStorage(registry, nodeRegistry, endpointRegistry, r, portAllocator, "kubernetes")
+	storage := NewStorage(registry, endpointRegistry, r, portAllocator)
 
 	return storage, registry
 }