Expose REST resource for endpoints and watch on services/endpoints

Will allow kube-proxies to listen on endpoints.

pkg/registry/endpoint/registry.go

@@ -0,0 +1,30 @@
+/*
+Copyright 2014 Google Inc. 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 endpoint
+
+import (
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+)
+
+// Registry is an interface for things that know how to store endpoints.
+type Registry interface {
+	GetEndpoints(name string) (*api.Endpoints, error)
+	WatchEndpoints(labels, fields labels.Selector, resourceVersion uint64) (watch.Interface, error)
+	UpdateEndpoints(e api.Endpoints) error
+}

pkg/registry/endpoint/storage.go

@@ -0,0 +1,74 @@
+/*
+Copyright 2014 Google Inc. 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 endpoint
+
+import (
+	"errors"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/watch"
+)
+
+// Storage adapts endpoints into apiserver's RESTStorage model.
+type Storage struct {
+	registry Registry
+}
+
+// NewStorage returns a new Storage implementation for endpoints
+func NewStorage(registry Registry) apiserver.RESTStorage {
+	return &Storage{
+		registry: registry,
+	}
+}
+
+// Get satisfies the RESTStorage interface but is unimplemented
+func (rs *Storage) Get(id string) (interface{}, error) {
+	return rs.registry.GetEndpoints(id)
+}
+
+// List satisfies the RESTStorage interface but is unimplemented
+func (rs *Storage) List(selector labels.Selector) (interface{}, error) {
+	return nil, errors.New("unimplemented")
+}
+
+// Watch returns Endpoint events via a watch.Interface.
+// It implements apiserver.ResourceWatcher.
+func (rs *Storage) Watch(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error) {
+	return rs.registry.WatchEndpoints(label, field, resourceVersion)
+}
+
+// Create satisfies the RESTStorage interface but is unimplemented
+func (rs *Storage) Create(obj interface{}) (<-chan interface{}, error) {
+	return nil, errors.New("unimplemented")
+}
+
+// Update satisfies the RESTStorage interface but is unimplemented
+func (rs *Storage) Update(obj interface{}) (<-chan interface{}, error) {
+	return nil, errors.New("unimplemented")
+}
+
+// Delete satisfies the RESTStorage interface but is unimplemented
+func (rs *Storage) Delete(id string) (<-chan interface{}, error) {
+	return nil, errors.New("unimplemented")
+}
+
+// New implements the RESTStorage interface
+func (rs Storage) New() interface{} {
+	return &api.Endpoints{}
+}

pkg/registry/endpoint/storage_test.go

@@ -0,0 +1,69 @@
+/*
+Copyright 2014 Google Inc. 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 endpoint
+
+import (
+	"reflect"
+	"testing"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/apiserver"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/registrytest"
+)
+
+func TestGetEndpoints(t *testing.T) {
+	registry := &registrytest.ServiceRegistry{
+		Endpoints: api.Endpoints{
+			JSONBase:  api.JSONBase{ID: "foo"},
+			Endpoints: []string{"127.0.0.1:9000"},
+		},
+	}
+	storage := NewStorage(registry)
+	obj, err := storage.Get("foo")
+	if err != nil {
+		t.Fatalf("unexpected error: %#v", err)
+	}
+	if !reflect.DeepEqual([]string{"127.0.0.1:9000"}, obj.(*api.Endpoints).Endpoints) {
+		t.Errorf("unexpected endpoints: %#v", obj)
+	}
+}
+
+func TestGetEndpointsMissingService(t *testing.T) {
+	registry := &registrytest.ServiceRegistry{
+		Err: apiserver.NewNotFoundErr("service", "foo"),
+	}
+	storage := NewStorage(registry)
+
+	// returns service not found
+	_, err := storage.Get("foo")
+	if !apiserver.IsNotFound(err) || !reflect.DeepEqual(err, apiserver.NewNotFoundErr("service", "foo")) {
+		t.Errorf("expected NotFound error, got %#v", err)
+	}
+
+	// returns empty endpoints
+	registry.Err = nil
+	registry.Service = &api.Service{
+		JSONBase: api.JSONBase{ID: "foo"},
+	}
+	obj, err := storage.Get("foo")
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if obj.(*api.Endpoints).Endpoints != nil {
+		t.Errorf("unexpected endpoints: %#v", obj)
+	}
+}