Merge pull request #12340 from wojtek-t/rewrite_service_etcd

contrib/mesos/pkg/scheduler/podtask/leaky.go

@@ -20,10 +20,10 @@ package podtask
 
 import (
 	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/registry/etcd"
+	"k8s.io/kubernetes/pkg/registry/generic/etcd"
 )
 
 // makePodKey constructs etcd paths to pod items enforcing namespace rules.
 func MakePodKey(ctx api.Context, id string) (string, error) {
-	return etcd.MakeEtcdItemKey(ctx, PodPath, id)
+	return etcd.NamespaceKeyFunc(ctx, PodPath, id)
 }

pkg/master/master.go

@@ -53,7 +53,6 @@ import (
 	controlleretcd "k8s.io/kubernetes/pkg/registry/controller/etcd"
 	"k8s.io/kubernetes/pkg/registry/endpoint"
 	endpointsetcd "k8s.io/kubernetes/pkg/registry/endpoint/etcd"
-	"k8s.io/kubernetes/pkg/registry/etcd"
 	"k8s.io/kubernetes/pkg/registry/event"
 	expcontrolleretcd "k8s.io/kubernetes/pkg/registry/experimental/controller/etcd"
 	"k8s.io/kubernetes/pkg/registry/limitrange"
@@ -69,6 +68,7 @@ import (
 	secretetcd "k8s.io/kubernetes/pkg/registry/secret/etcd"
 	"k8s.io/kubernetes/pkg/registry/service"
 	etcdallocator "k8s.io/kubernetes/pkg/registry/service/allocator/etcd"
+	serviceetcd "k8s.io/kubernetes/pkg/registry/service/etcd"
 	ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator"
 	serviceaccountetcd "k8s.io/kubernetes/pkg/registry/serviceaccount/etcd"
 	"k8s.io/kubernetes/pkg/storage"
@@ -450,9 +450,8 @@ func (m *Master) init(c *Config) {
 	nodeStorage, nodeStatusStorage := nodeetcd.NewStorage(c.DatabaseStorage, c.KubeletClient)
 	m.nodeRegistry = minion.NewRegistry(nodeStorage)
 
-	// TODO: split me up into distinct storage registries
-	registry := etcd.NewRegistry(c.DatabaseStorage, m.endpointRegistry)
-	m.serviceRegistry = registry
+	serviceStorage := serviceetcd.NewStorage(c.DatabaseStorage)
+	m.serviceRegistry = service.NewRegistry(serviceStorage)
 
 	var serviceClusterIPRegistry service.RangeRegistry
 	serviceClusterIPAllocator := ipallocator.NewAllocatorCIDRRange(m.serviceClusterIPRange, func(max int, rangeSpec string) allocator.Interface {

pkg/registry/etcd/doc.go

-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Package etcd provides etcd backend implementation for storing
-// PodRegistry, ControllerRegistry and ServiceRegistry api objects.
-package etcd

pkg/registry/etcd/etcd.go

-/*
-Copyright 2014 The Kubernetes Authors All rights reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package etcd
-
-import (
-	"fmt"
-
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/api/errors"
-	etcderr "k8s.io/kubernetes/pkg/api/errors/etcd"
-	"k8s.io/kubernetes/pkg/fields"
-	"k8s.io/kubernetes/pkg/labels"
-	"k8s.io/kubernetes/pkg/registry/endpoint"
-	"k8s.io/kubernetes/pkg/storage"
-	"k8s.io/kubernetes/pkg/watch"
-)
-
-const (
-	// ServicePath is the path to service resources in etcd
-	ServicePath string = "/services/specs"
-)
-
-// TODO(wojtek-t): Change it to use rest.StandardStorage (as everything else)
-// and move it to service/ directory.
-
-// TODO: Need to add a reconciler loop that makes sure that things in pods are reflected into
-//       kubelet (and vice versa)
-
-// Registry implements BindingRegistry, ControllerRegistry, EndpointRegistry,
-// MinionRegistry, PodRegistry and ServiceRegistry, backed by etcd.
-type Registry struct {
-	storage.Interface
-	endpoints endpoint.Registry
-}
-
-// NewRegistry creates an etcd registry.
-func NewRegistry(storage storage.Interface, endpoints endpoint.Registry) *Registry {
-	registry := &Registry{
-		Interface: storage,
-		endpoints: endpoints,
-	}
-	return registry
-}
-
-// MakeEtcdListKey constructs etcd paths to resource directories enforcing namespace rules
-func MakeEtcdListKey(ctx api.Context, prefix string) string {
-	key := prefix
-	ns, ok := api.NamespaceFrom(ctx)
-	if ok && len(ns) > 0 {
-		key = key + "/" + ns
-	}
-	return key
-}
-
-// MakeEtcdItemKey constructs etcd paths to a resource relative to prefix enforcing namespace rules.  If no namespace is on context, it errors.
-func MakeEtcdItemKey(ctx api.Context, prefix string, id string) (string, error) {
-	key := MakeEtcdListKey(ctx, prefix)
-	ns, ok := api.NamespaceFrom(ctx)
-	if !ok || len(ns) == 0 {
-		return "", fmt.Errorf("invalid request.  Namespace parameter required.")
-	}
-	if len(id) == 0 {
-		return "", fmt.Errorf("invalid request.  Id parameter required.")
-	}
-	key = key + "/" + id
-	return key, nil
-}
-
-// makePodListKey constructs etcd paths to service directories enforcing namespace rules.
-func makeServiceListKey(ctx api.Context) string {
-	return MakeEtcdListKey(ctx, ServicePath)
-}
-
-// makeServiceKey constructs etcd paths to service items enforcing namespace rules.
-func makeServiceKey(ctx api.Context, name string) (string, error) {
-	return MakeEtcdItemKey(ctx, ServicePath, name)
-}
-
-// ListServices obtains a list of Services.
-func (r *Registry) ListServices(ctx api.Context) (*api.ServiceList, error) {
-	list := &api.ServiceList{}
-	err := r.List(makeServiceListKey(ctx), list)
-	return list, err
-}
-
-// CreateService creates a new Service.
-func (r *Registry) CreateService(ctx api.Context, svc *api.Service) (*api.Service, error) {
-	key, err := makeServiceKey(ctx, svc.Name)
-	if err != nil {
-		return nil, err
-	}
-	out := &api.Service{}
-	err = r.Create(key, svc, out, 0)
-	return out, etcderr.InterpretCreateError(err, "service", svc.Name)
-}
-
-// GetService obtains a Service specified by its name.
-func (r *Registry) GetService(ctx api.Context, name string) (*api.Service, error) {
-	key, err := makeServiceKey(ctx, name)
-	if err != nil {
-		return nil, err
-	}
-	var svc api.Service
-	err = r.Get(key, &svc, false)
-	if err != nil {
-		return nil, etcderr.InterpretGetError(err, "service", name)
-	}
-	return &svc, nil
-}
-
-// DeleteService deletes a Service specified by its name.
-func (r *Registry) DeleteService(ctx api.Context, name string) error {
-	key, err := makeServiceKey(ctx, name)
-	if err != nil {
-		return err
-	}
-	err = r.RecursiveDelete(key, true)
-	if err != nil {
-		return etcderr.InterpretDeleteError(err, "service", name)
-	}
-
-	// TODO: can leave dangling endpoints, and potentially return incorrect
-	// endpoints if a new service is created with the same name
-	err = r.endpoints.DeleteEndpoints(ctx, name)
-	if err != nil && !errors.IsNotFound(err) {
-		return err
-	}
-	return nil
-}
-
-// UpdateService replaces an existing Service.
-func (r *Registry) UpdateService(ctx api.Context, svc *api.Service) (*api.Service, error) {
-	key, err := makeServiceKey(ctx, svc.Name)
-	if err != nil {
-		return nil, err
-	}
-	out := &api.Service{}
-	err = r.Set(key, svc, out, 0)
-	return out, etcderr.InterpretUpdateError(err, "service", svc.Name)
-}
-
-// WatchServices begins watching for new, changed, or deleted service configurations.
-func (r *Registry) WatchServices(ctx api.Context, label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {
-	version, err := storage.ParseWatchResourceVersion(resourceVersion, "service")
-	if err != nil {
-		return nil, err
-	}
-	if !label.Empty() {
-		return nil, fmt.Errorf("label selectors are not supported on services")
-	}
-	if value, found := field.RequiresExactMatch("name"); found {
-		key, err := makeServiceKey(ctx, value)
-		if err != nil {
-			return nil, err
-		}
-		// TODO: use generic.SelectionPredicate
-		return r.Watch(key, version, storage.Everything)
-	}
-	if field.Empty() {
-		return r.WatchList(makeServiceListKey(ctx), version, storage.Everything)
-	}
-	return nil, fmt.Errorf("only the 'name' and default (everything) field selectors are supported")
-}

pkg/registry/registrytest/endpoint.go

@@ -93,5 +93,20 @@ func (e *EndpointRegistry) UpdateEndpoints(ctx api.Context, endpoints *api.Endpo
 }
 
 func (e *EndpointRegistry) DeleteEndpoints(ctx api.Context, name string) error {
-	return fmt.Errorf("unimplemented!")
+	// TODO: support namespaces in this mock
+	e.lock.Lock()
+	defer e.lock.Unlock()
+	if e.Err != nil {
+		return e.Err
+	}
+	if e.Endpoints != nil {
+		var newList []api.Endpoints
+		for _, endpoint := range e.Endpoints.Items {
+			if endpoint.Name != name {
+				newList = append(newList, endpoint)
+			}
+		}
+		e.Endpoints.Items = newList
+	}
+	return nil
 }

pkg/registry/registrytest/service.go

@@ -46,7 +46,7 @@ func (r *ServiceRegistry) SetError(err error) {
 	r.Err = err
 }
 
-func (r *ServiceRegistry) ListServices(ctx api.Context) (*api.ServiceList, error) {
+func (r *ServiceRegistry) ListServices(ctx api.Context, label labels.Selector, field fields.Selector) (*api.ServiceList, error) {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 

pkg/registry/service/etcd/etcd.go

+/*
+Copyright 2015 The Kubernetes Authors All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package etcd
+
+import (
+	"fmt"
+
+	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/rest"
+	"k8s.io/kubernetes/pkg/fields"
+	"k8s.io/kubernetes/pkg/labels"
+	"k8s.io/kubernetes/pkg/registry/generic"
+	etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd"
+	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/storage"
+)
+
+type REST struct {
+	etcdgeneric.Etcd
+}
+
+func NewStorage(s storage.Interface) *REST {
+	prefix := "/services/specs"
+	store := etcdgeneric.Etcd{
+		NewFunc:     func() runtime.Object { return &api.Service{} },
+		NewListFunc: func() runtime.Object { return &api.ServiceList{} },
+		KeyRootFunc: func(ctx api.Context) string {
+			return etcdgeneric.NamespaceKeyRootFunc(ctx, prefix)
+		},
+		KeyFunc: func(ctx api.Context, name string) (string, error) {
+			return etcdgeneric.NamespaceKeyFunc(ctx, prefix, name)
+		},
+		ObjectNameFunc: func(obj runtime.Object) (string, error) {
+			return obj.(*api.Service).Name, nil
+		},
+		PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher {
+			return MatchServices(label, field)
+		},
+		EndpointName: "services",
+
+		CreateStrategy: rest.Services,
+		UpdateStrategy: rest.Services,
+
+		Storage: s,
+	}
+	return &REST{store}
+}
+
+func MatchServices(label labels.Selector, field fields.Selector) generic.Matcher {
+	return &generic.SelectionPredicate{label, field, ServiceAttributes}
+}
+
+func ServiceAttributes(obj runtime.Object) (objLabels labels.Set, objFields fields.Set, err error) {
+	service, ok := obj.(*api.Service)
+	if !ok {
+		return nil, nil, fmt.Errorf("invalid object type %#v", obj)
+	}
+	return service.Labels, fields.Set{
+		"metadata.name": service.Name,
+	}, nil
+}

pkg/registry/service/ipallocator/controller/repair.go

@@ -22,6 +22,8 @@ import (
 	"time"
 
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/fields"
+	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/registry/service"
 	"k8s.io/kubernetes/pkg/registry/service/ipallocator"
 	"k8s.io/kubernetes/pkg/util"
@@ -94,7 +96,7 @@ func (c *Repair) RunOnce() error {
 	}
 
 	ctx := api.WithNamespace(api.NewDefaultContext(), api.NamespaceAll)
-	list, err := c.registry.ListServices(ctx)
+	list, err := c.registry.ListServices(ctx, labels.Everything(), fields.Everything())
 	if err != nil {
 		return fmt.Errorf("unable to refresh the service IP block: %v", err)
 	}

pkg/registry/service/portallocator/controller/repair.go

@@ -21,6 +21,8 @@ import (
 	"time"
 
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/fields"
+	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/registry/service"
 	"k8s.io/kubernetes/pkg/registry/service/portallocator"
 	"k8s.io/kubernetes/pkg/util"
@@ -79,7 +81,7 @@ func (c *Repair) RunOnce() error {
 	}
 
 	ctx := api.WithNamespace(api.NewDefaultContext(), api.NamespaceAll)
-	list, err := c.registry.ListServices(ctx)
+	list, err := c.registry.ListServices(ctx, labels.Everything(), fields.Everything())
 	if err != nil {
 		return fmt.Errorf("unable to refresh the port block: %v", err)
 	}

pkg/registry/service/registry.go

@@ -18,6 +18,7 @@ package service
 
 import (
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/fields"
 	"k8s.io/kubernetes/pkg/labels"
 	"k8s.io/kubernetes/pkg/watch"
@@ -25,7 +26,7 @@ import (
 
 // Registry is an interface for things that know how to store services.
 type Registry interface {
-	ListServices(ctx api.Context) (*api.ServiceList, error)
+	ListServices(ctx api.Context, label labels.Selector, field fields.Selector) (*api.ServiceList, error)
 	CreateService(ctx api.Context, svc *api.Service) (*api.Service, error)
 	GetService(ctx api.Context, name string) (*api.Service, error)
 	DeleteService(ctx api.Context, name string) error
@@ -33,6 +34,58 @@ type Registry interface {
 	WatchServices(ctx api.Context, labels labels.Selector, fields fields.Selector, resourceVersion string) (watch.Interface, error)
 }
 
+// storage puts strong typing around storage calls
+type storage struct {
+	rest.StandardStorage
+}
+
+// NewRegistry returns a new Registry interface for the given Storage. Any mismatched
+// types will panic.
+func NewRegistry(s rest.StandardStorage) Registry {
+	return &storage{s}
+}
+
+func (s *storage) ListServices(ctx api.Context, label labels.Selector, field fields.Selector) (*api.ServiceList, error) {
+	obj, err := s.List(ctx, label, field)
+	if err != nil {
+		return nil, err
+	}
+	return obj.(*api.ServiceList), nil
+}
+
+func (s *storage) CreateService(ctx api.Context, svc *api.Service) (*api.Service, error) {
+	obj, err := s.Create(ctx, svc)
+	if err != nil {
+		return nil, err
+	}
+	return obj.(*api.Service), nil
+}
+
+func (s *storage) GetService(ctx api.Context, name string) (*api.Service, error) {
+	obj, err := s.Get(ctx, name)
+	if err != nil {
+		return nil, err
+	}
+	return obj.(*api.Service), nil
+}
+
+func (s *storage) DeleteService(ctx api.Context, name string) error {
+	_, err := s.Delete(ctx, name, nil)
+	return err
+}
+
+func (s *storage) UpdateService(ctx api.Context, svc *api.Service) (*api.Service, error) {
+	obj, _, err := s.Update(ctx, svc)
+	if err != nil {
+		return nil, err
+	}
+	return obj.(*api.Service), nil
+}
+
+func (s *storage) WatchServices(ctx api.Context, labels labels.Selector, fields fields.Selector, resourceVersion string) (watch.Interface, error) {
+	return s.Watch(ctx, labels, fields, resourceVersion)
+}
+
 // TODO: Move to a general location (as other components may need allocation in future; it's not service specific)
 // RangeRegistry is a registry that can retrieve or persist a RangeAllocation object.
 type RangeRegistry interface {

pkg/registry/service/rest.go

@@ -144,6 +144,13 @@ func (rs *REST) Delete(ctx api.Context, id string) (runtime.Object, error) {
 		return nil, err
 	}
 
+	// TODO: can leave dangling endpoints, and potentially return incorrect
+	// endpoints if a new service is created with the same name
+	err = rs.endpoints.DeleteEndpoints(ctx, id)
+	if err != nil && !errors.IsNotFound(err) {
+		return nil, err
+	}
+
 	if api.IsServiceIPSet(service) {
 		rs.serviceIPs.Release(net.ParseIP(service.Spec.ClusterIP))
 	}
@@ -160,26 +167,11 @@ func (rs *REST) Delete(ctx api.Context, id string) (runtime.Object, error) {
 }
 
 func (rs *REST) Get(ctx api.Context, id string) (runtime.Object, error) {
-	service, err := rs.registry.GetService(ctx, id)
-	if err != nil {
-		return nil, err
-	}
-	return service, err
+	return rs.registry.GetService(ctx, id)
 }
 
 func (rs *REST) List(ctx api.Context, label labels.Selector, field fields.Selector) (runtime.Object, error) {
-	list, err := rs.registry.ListServices(ctx)
-	if err != nil {
-		return nil, err
-	}
-	var filtered []api.Service
-	for _, service := range list.Items {
-		if label.Matches(labels.Set(service.Labels)) {
-			filtered = append(filtered, service)
-		}
-	}
-	list.Items = filtered
-	return list, err
+	return rs.registry.ListServices(ctx, label, field)
 }
 
 // Watch returns Services events via a watch.Interface.