Commit 264a658a authored by Saad Ali's avatar Saad Ali

Merge pull request #12869 from vishh/daemon-registry-client

Daemon registry client
parents cd798a47 ec22c2dd
...@@ -225,6 +225,58 @@ func (s *StoreToReplicationControllerLister) GetPodControllers(pod *api.Pod) (co ...@@ -225,6 +225,58 @@ func (s *StoreToReplicationControllerLister) GetPodControllers(pod *api.Pod) (co
return return
} }
// StoreToDaemonLister gives a store List and Exists methods. The store must contain only Daemons.
type StoreToDaemonLister struct {
Store
}
// Exists checks if the given dc exists in the store.
func (s *StoreToDaemonLister) Exists(daemon *api.Daemon) (bool, error) {
_, exists, err := s.Store.Get(daemon)
if err != nil {
return false, err
}
return exists, nil
}
// StoreToDaemonLister lists all daemons in the store.
// TODO: converge on the interface in pkg/client
func (s *StoreToDaemonLister) List() (daemons []api.Daemon, err error) {
for _, c := range s.Store.List() {
daemons = append(daemons, *(c.(*api.Daemon)))
}
return daemons, nil
}
// GetPodDaemons returns a list of daemons managing a pod. Returns an error iff no matching daemons are found.
func (s *StoreToDaemonLister) GetPodDaemons(pod *api.Pod) (daemons []api.Daemon, err error) {
var selector labels.Selector
var daemonController api.Daemon
if len(pod.Labels) == 0 {
err = fmt.Errorf("No daemons found for pod %v because it has no labels", pod.Name)
return
}
for _, m := range s.Store.List() {
daemonController = *m.(*api.Daemon)
if daemonController.Namespace != pod.Namespace {
continue
}
selector = labels.Set(daemonController.Spec.Selector).AsSelector()
// If a daemonController with a nil or empty selector creeps in, it should match nothing, not everything.
if selector.Empty() || !selector.Matches(labels.Set(pod.Labels)) {
continue
}
daemons = append(daemons, daemonController)
}
if len(daemons) == 0 {
err = fmt.Errorf("Could not find daemons for pod %s in namespace %s with labels: %v", pod.Name, pod.Namespace, pod.Labels)
}
return
}
// StoreToServiceLister makes a Store that has the List method of the client.ServiceInterface // StoreToServiceLister makes a Store that has the List method of the client.ServiceInterface
// The Store must contain (only) Services. // The Store must contain (only) Services.
type StoreToServiceLister struct { type StoreToServiceLister struct {
......
...@@ -64,7 +64,7 @@ func TestStoreToReplicationControllerLister(t *testing.T) { ...@@ -64,7 +64,7 @@ func TestStoreToReplicationControllerLister(t *testing.T) {
}, },
outRCNames: util.NewStringSet("basic"), outRCNames: util.NewStringSet("basic"),
}, },
// No pod lables // No pod labels
{ {
inRCs: []*api.ReplicationController{ inRCs: []*api.ReplicationController{
{ {
...@@ -155,6 +155,128 @@ func TestStoreToReplicationControllerLister(t *testing.T) { ...@@ -155,6 +155,128 @@ func TestStoreToReplicationControllerLister(t *testing.T) {
} }
} }
func TestStoreToDaemonLister(t *testing.T) {
store := NewStore(MetaNamespaceKeyFunc)
lister := StoreToDaemonLister{store}
testCases := []struct {
inDCs []*api.Daemon
list func() ([]api.Daemon, error)
outDCNames util.StringSet
expectErr bool
}{
// Basic listing
{
inDCs: []*api.Daemon{
{ObjectMeta: api.ObjectMeta{Name: "basic"}},
},
list: func() ([]api.Daemon, error) {
return lister.List()
},
outDCNames: util.NewStringSet("basic"),
},
// Listing multiple controllers
{
inDCs: []*api.Daemon{
{ObjectMeta: api.ObjectMeta{Name: "basic"}},
{ObjectMeta: api.ObjectMeta{Name: "complex"}},
{ObjectMeta: api.ObjectMeta{Name: "complex2"}},
},
list: func() ([]api.Daemon, error) {
return lister.List()
},
outDCNames: util.NewStringSet("basic", "complex", "complex2"),
},
// No pod labels
{
inDCs: []*api.Daemon{
{
ObjectMeta: api.ObjectMeta{Name: "basic", Namespace: "ns"},
Spec: api.DaemonSpec{
Selector: map[string]string{"foo": "baz"},
},
},
},
list: func() ([]api.Daemon, error) {
pod := &api.Pod{
ObjectMeta: api.ObjectMeta{Name: "pod1", Namespace: "ns"},
}
return lister.GetPodDaemons(pod)
},
outDCNames: util.NewStringSet(),
expectErr: true,
},
// No RC selectors
{
inDCs: []*api.Daemon{
{
ObjectMeta: api.ObjectMeta{Name: "basic", Namespace: "ns"},
},
},
list: func() ([]api.Daemon, error) {
pod := &api.Pod{
ObjectMeta: api.ObjectMeta{
Name: "pod1",
Namespace: "ns",
Labels: map[string]string{"foo": "bar"},
},
}
return lister.GetPodDaemons(pod)
},
outDCNames: util.NewStringSet(),
expectErr: true,
},
// Matching labels to selectors and namespace
{
inDCs: []*api.Daemon{
{
ObjectMeta: api.ObjectMeta{Name: "foo"},
Spec: api.DaemonSpec{
Selector: map[string]string{"foo": "bar"},
},
},
{
ObjectMeta: api.ObjectMeta{Name: "bar", Namespace: "ns"},
Spec: api.DaemonSpec{
Selector: map[string]string{"foo": "bar"},
},
},
},
list: func() ([]api.Daemon, error) {
pod := &api.Pod{
ObjectMeta: api.ObjectMeta{
Name: "pod1",
Labels: map[string]string{"foo": "bar"},
Namespace: "ns",
},
}
return lister.GetPodDaemons(pod)
},
outDCNames: util.NewStringSet("bar"),
},
}
for _, c := range testCases {
for _, r := range c.inDCs {
store.Add(r)
}
gotControllers, err := c.list()
if err != nil && c.expectErr {
continue
} else if c.expectErr {
t.Fatalf("Expected error, got none")
} else if err != nil {
t.Fatalf("Unexpected error %#v", err)
}
gotNames := make([]string, len(gotControllers))
for ix := range gotControllers {
gotNames[ix] = gotControllers[ix].Name
}
if !c.outDCNames.HasAll(gotNames...) || len(gotNames) != len(c.outDCNames) {
t.Errorf("Unexpected got controllers %+v expected %+v", gotNames, c.outDCNames)
}
}
}
func TestStoreToPodLister(t *testing.T) { func TestStoreToPodLister(t *testing.T) {
store := NewStore(MetaNamespaceKeyFunc) store := NewStore(MetaNamespaceKeyFunc)
ids := []string{"foo", "bar", "baz"} ids := []string{"foo", "bar", "baz"}
......
...@@ -33,6 +33,7 @@ type Interface interface { ...@@ -33,6 +33,7 @@ type Interface interface {
PodsNamespacer PodsNamespacer
PodTemplatesNamespacer PodTemplatesNamespacer
ReplicationControllersNamespacer ReplicationControllersNamespacer
DaemonsNamespacer
ServicesNamespacer ServicesNamespacer
EndpointsNamespacer EndpointsNamespacer
VersionInterface VersionInterface
...@@ -52,6 +53,10 @@ func (c *Client) ReplicationControllers(namespace string) ReplicationControllerI ...@@ -52,6 +53,10 @@ func (c *Client) ReplicationControllers(namespace string) ReplicationControllerI
return newReplicationControllers(c, namespace) return newReplicationControllers(c, namespace)
} }
func (c *Client) Daemons(namespace string) DaemonInterface {
return newDaemons(c, namespace)
}
func (c *Client) Nodes() NodeInterface { func (c *Client) Nodes() NodeInterface {
return newNodes(c) return newNodes(c)
} }
......
/*
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 unversioned
import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/watch"
)
// DaemonsNamespacer has methods to work with Daemon resources in a namespace
type DaemonsNamespacer interface {
Daemons(namespace string) DaemonInterface
}
type DaemonInterface interface {
List(selector labels.Selector) (*api.DaemonList, error)
Get(name string) (*api.Daemon, error)
Create(ctrl *api.Daemon) (*api.Daemon, error)
Update(ctrl *api.Daemon) (*api.Daemon, error)
Delete(name string) error
Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error)
}
// daemons implements DaemonsNamespacer interface
type daemons struct {
r *Client
ns string
}
func newDaemons(c *Client, namespace string) *daemons {
return &daemons{c, namespace}
}
// Ensure statically that daemons implements DaemonInterface.
var _ DaemonInterface = &daemons{}
func (c *daemons) List(selector labels.Selector) (result *api.DaemonList, err error) {
result = &api.DaemonList{}
err = c.r.Get().Namespace(c.ns).Resource("daemons").LabelsSelectorParam(selector).Do().Into(result)
return
}
// Get returns information about a particular daemon.
func (c *daemons) Get(name string) (result *api.Daemon, err error) {
result = &api.Daemon{}
err = c.r.Get().Namespace(c.ns).Resource("daemons").Name(name).Do().Into(result)
return
}
// Create creates a new daemon.
func (c *daemons) Create(daemon *api.Daemon) (result *api.Daemon, err error) {
result = &api.Daemon{}
err = c.r.Post().Namespace(c.ns).Resource("daemons").Body(daemon).Do().Into(result)
return
}
// Update updates an existing daemon.
func (c *daemons) Update(daemon *api.Daemon) (result *api.Daemon, err error) {
result = &api.Daemon{}
err = c.r.Put().Namespace(c.ns).Resource("daemons").Name(daemon.Name).Body(daemon).Do().Into(result)
return
}
// Delete deletes an existing daemon.
func (c *daemons) Delete(name string) error {
return c.r.Delete().Namespace(c.ns).Resource("daemons").Name(name).Do().Error()
}
// Watch returns a watch.Interface that watches the requested daemons.
func (c *daemons) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {
return c.r.Get().
Prefix("watch").
Namespace(c.ns).
Resource("daemons").
Param("resourceVersion", resourceVersion).
LabelsSelectorParam(label).
FieldsSelectorParam(field).
Watch()
}
/*
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 unversioned
import (
"testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/labels"
)
func getDCResourceName() string {
return "daemons"
}
func TestListDaemons(t *testing.T) {
ns := api.NamespaceAll
c := &testClient{
Request: testRequest{
Method: "GET",
Path: testapi.ResourcePath(getDCResourceName(), ns, ""),
},
Response: Response{StatusCode: 200,
Body: &api.DaemonList{
Items: []api.Daemon{
{
ObjectMeta: api.ObjectMeta{
Name: "foo",
Labels: map[string]string{
"foo": "bar",
"name": "baz",
},
},
Spec: api.DaemonSpec{
Template: &api.PodTemplateSpec{},
},
},
},
},
},
}
receivedControllerList, err := c.Setup().Daemons(ns).List(labels.Everything())
c.Validate(t, receivedControllerList, err)
}
func TestGetDaemon(t *testing.T) {
ns := api.NamespaceDefault
c := &testClient{
Request: testRequest{Method: "GET", Path: testapi.ResourcePath(getDCResourceName(), ns, "foo"), Query: buildQueryValues(nil)},
Response: Response{
StatusCode: 200,
Body: &api.Daemon{
ObjectMeta: api.ObjectMeta{
Name: "foo",
Labels: map[string]string{
"foo": "bar",
"name": "baz",
},
},
Spec: api.DaemonSpec{
Template: &api.PodTemplateSpec{},
},
},
},
}
receivedController, err := c.Setup().Daemons(ns).Get("foo")
c.Validate(t, receivedController, err)
}
func TestGetDaemonWithNoName(t *testing.T) {
ns := api.NamespaceDefault
c := &testClient{Error: true}
receivedPod, err := c.Setup().Daemons(ns).Get("")
if (err != nil) && (err.Error() != nameRequiredError) {
t.Errorf("Expected error: %v, but got %v", nameRequiredError, err)
}
c.Validate(t, receivedPod, err)
}
func TestUpdateDaemon(t *testing.T) {
ns := api.NamespaceDefault
requestController := &api.Daemon{
ObjectMeta: api.ObjectMeta{Name: "foo", ResourceVersion: "1"},
}
c := &testClient{
Request: testRequest{Method: "PUT", Path: testapi.ResourcePath(getDCResourceName(), ns, "foo"), Query: buildQueryValues(nil)},
Response: Response{
StatusCode: 200,
Body: &api.Daemon{
ObjectMeta: api.ObjectMeta{
Name: "foo",
Labels: map[string]string{
"foo": "bar",
"name": "baz",
},
},
Spec: api.DaemonSpec{
Template: &api.PodTemplateSpec{},
},
},
},
}
receivedController, err := c.Setup().Daemons(ns).Update(requestController)
c.Validate(t, receivedController, err)
}
func TestDeleteDaemon(t *testing.T) {
ns := api.NamespaceDefault
c := &testClient{
Request: testRequest{Method: "DELETE", Path: testapi.ResourcePath(getDCResourceName(), ns, "foo"), Query: buildQueryValues(nil)},
Response: Response{StatusCode: 200},
}
err := c.Setup().Daemons(ns).Delete("foo")
c.Validate(t, nil, err)
}
func TestCreateDaemon(t *testing.T) {
ns := api.NamespaceDefault
requestController := &api.Daemon{
ObjectMeta: api.ObjectMeta{Name: "foo"},
}
c := &testClient{
Request: testRequest{Method: "POST", Path: testapi.ResourcePath(getDCResourceName(), ns, ""), Body: requestController, Query: buildQueryValues(nil)},
Response: Response{
StatusCode: 200,
Body: &api.Daemon{
ObjectMeta: api.ObjectMeta{
Name: "foo",
Labels: map[string]string{
"foo": "bar",
"name": "baz",
},
},
Spec: api.DaemonSpec{
Template: &api.PodTemplateSpec{},
},
},
},
}
receivedController, err := c.Setup().Daemons(ns).Create(requestController)
c.Validate(t, receivedController, err)
}
...@@ -17,7 +17,7 @@ limitations under the License. ...@@ -17,7 +17,7 @@ limitations under the License.
/* /*
Package client contains the implementation of the client side communication with the Package client contains the implementation of the client side communication with the
Kubernetes master. The Client class provides methods for reading, creating, updating, Kubernetes master. The Client class provides methods for reading, creating, updating,
and deleting pods, replication controllers, services, and minions. and deleting pods, replication controllers, daemons, services, and minions.
Most consumers should use the Config object to create a Client: Most consumers should use the Config object to create a Client:
......
...@@ -127,7 +127,7 @@ type TLSClientConfig struct { ...@@ -127,7 +127,7 @@ type TLSClientConfig struct {
} }
// New creates a Kubernetes client for the given config. This client works with pods, // New creates a Kubernetes client for the given config. This client works with pods,
// replication controllers and services. It allows operations such as list, get, update // replication controllers, daemons, and services. It allows operations such as list, get, update
// and delete on these objects. An error is returned if the provided configuration // and delete on these objects. An error is returned if the provided configuration
// is not valid. // is not valid.
func New(c *Config) (*Client, error) { func New(c *Config) (*Client, error) {
......
...@@ -45,6 +45,7 @@ func TestResourceQuotaCreate(t *testing.T) { ...@@ -45,6 +45,7 @@ func TestResourceQuotaCreate(t *testing.T) {
api.ResourcePods: resource.MustParse("10"), api.ResourcePods: resource.MustParse("10"),
api.ResourceServices: resource.MustParse("10"), api.ResourceServices: resource.MustParse("10"),
api.ResourceReplicationControllers: resource.MustParse("10"), api.ResourceReplicationControllers: resource.MustParse("10"),
api.ResourceDaemon: resource.MustParse("10"),
api.ResourceQuotas: resource.MustParse("10"), api.ResourceQuotas: resource.MustParse("10"),
}, },
}, },
...@@ -77,6 +78,7 @@ func TestResourceQuotaGet(t *testing.T) { ...@@ -77,6 +78,7 @@ func TestResourceQuotaGet(t *testing.T) {
api.ResourcePods: resource.MustParse("10"), api.ResourcePods: resource.MustParse("10"),
api.ResourceServices: resource.MustParse("10"), api.ResourceServices: resource.MustParse("10"),
api.ResourceReplicationControllers: resource.MustParse("10"), api.ResourceReplicationControllers: resource.MustParse("10"),
api.ResourceDaemon: resource.MustParse("10"),
api.ResourceQuotas: resource.MustParse("10"), api.ResourceQuotas: resource.MustParse("10"),
}, },
}, },
...@@ -133,6 +135,7 @@ func TestResourceQuotaUpdate(t *testing.T) { ...@@ -133,6 +135,7 @@ func TestResourceQuotaUpdate(t *testing.T) {
api.ResourcePods: resource.MustParse("10"), api.ResourcePods: resource.MustParse("10"),
api.ResourceServices: resource.MustParse("10"), api.ResourceServices: resource.MustParse("10"),
api.ResourceReplicationControllers: resource.MustParse("10"), api.ResourceReplicationControllers: resource.MustParse("10"),
api.ResourceDaemon: resource.MustParse("10"),
api.ResourceQuotas: resource.MustParse("10"), api.ResourceQuotas: resource.MustParse("10"),
}, },
}, },
...@@ -160,6 +163,7 @@ func TestResourceQuotaStatusUpdate(t *testing.T) { ...@@ -160,6 +163,7 @@ func TestResourceQuotaStatusUpdate(t *testing.T) {
api.ResourcePods: resource.MustParse("10"), api.ResourcePods: resource.MustParse("10"),
api.ResourceServices: resource.MustParse("10"), api.ResourceServices: resource.MustParse("10"),
api.ResourceReplicationControllers: resource.MustParse("10"), api.ResourceReplicationControllers: resource.MustParse("10"),
api.ResourceDaemon: resource.MustParse("10"),
api.ResourceQuotas: resource.MustParse("10"), api.ResourceQuotas: resource.MustParse("10"),
}, },
}, },
......
/*
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 testclient
import (
"k8s.io/kubernetes/pkg/api"
kClientLib "k8s.io/kubernetes/pkg/client/unversioned"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/watch"
)
// FakeDaemons implements DaemonInterface. Meant to be embedded into a struct to get a default
// implementation. This makes faking out just the method you want to test easier.
type FakeDaemons struct {
Fake *Fake
Namespace string
}
const (
GetDaemonAction = "get-daemon"
UpdateDaemonAction = "update-daemon"
WatchDaemonAction = "watch-daemon"
DeleteDaemonAction = "delete-daemon"
ListDaemonAction = "list-daemons"
CreateDaemonAction = "create-daemon"
)
// Ensure statically that FakeDaemons implements DaemonInterface.
var _ kClientLib.DaemonInterface = &FakeDaemons{}
func (c *FakeDaemons) Get(name string) (*api.Daemon, error) {
obj, err := c.Fake.Invokes(NewGetAction("daemons", c.Namespace, name), &api.Daemon{})
return obj.(*api.Daemon), err
}
func (c *FakeDaemons) List(label labels.Selector) (*api.DaemonList, error) {
obj, err := c.Fake.Invokes(NewListAction("daemons", c.Namespace, label, nil), &api.DaemonList{})
return obj.(*api.DaemonList), err
}
func (c *FakeDaemons) Create(daemon *api.Daemon) (*api.Daemon, error) {
obj, err := c.Fake.Invokes(NewCreateAction("daemons", c.Namespace, daemon), &api.Daemon{})
return obj.(*api.Daemon), err
}
func (c *FakeDaemons) Update(daemon *api.Daemon) (*api.Daemon, error) {
obj, err := c.Fake.Invokes(NewUpdateAction("daemons", c.Namespace, daemon), &api.Daemon{})
return obj.(*api.Daemon), err
}
func (c *FakeDaemons) Delete(name string) error {
_, err := c.Fake.Invokes(NewDeleteAction("daemons", c.Namespace, name), &api.Daemon{})
return err
}
func (c *FakeDaemons) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {
c.Fake.Invokes(NewWatchAction("daemons", c.Namespace, label, field, resourceVersion), nil)
return c.Fake.Watch, nil
}
...@@ -114,6 +114,10 @@ func (c *Fake) ReplicationControllers(namespace string) client.ReplicationContro ...@@ -114,6 +114,10 @@ func (c *Fake) ReplicationControllers(namespace string) client.ReplicationContro
return &FakeReplicationControllers{Fake: c, Namespace: namespace} return &FakeReplicationControllers{Fake: c, Namespace: namespace}
} }
func (c *Fake) Daemons(namespace string) client.DaemonInterface {
return &FakeDaemons{Fake: c, Namespace: namespace}
}
func (c *Fake) Nodes() client.NodeInterface { func (c *Fake) Nodes() client.NodeInterface {
return &FakeNodes{Fake: c} return &FakeNodes{Fake: c}
} }
......
/*
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 daemon provides Registry interface and its RESTStorage
// implementation for storing Daemon api objects.
package daemon
/*
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 (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/registry/daemon"
"k8s.io/kubernetes/pkg/registry/generic"
etcdgeneric "k8s.io/kubernetes/pkg/registry/generic/etcd"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/storage"
)
// rest implements a RESTStorage for daemons against etcd
type REST struct {
*etcdgeneric.Etcd
}
// daemonPrefix is the location for daemons in etcd, only exposed
// for testing
var daemonPrefix = "/daemons"
// NewREST returns a RESTStorage object that will work against daemons.
func NewREST(s storage.Interface) *REST {
store := &etcdgeneric.Etcd{
NewFunc: func() runtime.Object { return &api.Daemon{} },
// NewListFunc returns an object capable of storing results of an etcd list.
NewListFunc: func() runtime.Object { return &api.DaemonList{} },
// Produces a path that etcd understands, to the root of the resource
// by combining the namespace in the context with the given prefix
KeyRootFunc: func(ctx api.Context) string {
return etcdgeneric.NamespaceKeyRootFunc(ctx, daemonPrefix)
},
// Produces a path that etcd understands, to the resource by combining
// the namespace in the context with the given prefix
KeyFunc: func(ctx api.Context, name string) (string, error) {
return etcdgeneric.NamespaceKeyFunc(ctx, daemonPrefix, name)
},
// Retrieve the name field of a daemon
ObjectNameFunc: func(obj runtime.Object) (string, error) {
return obj.(*api.Daemon).Name, nil
},
// Used to match objects based on labels/fields for list and watch
PredicateFunc: func(label labels.Selector, field fields.Selector) generic.Matcher {
return daemon.MatchDaemon(label, field)
},
EndpointName: "daemons",
// Used to validate daemon creation
CreateStrategy: daemon.Strategy,
// Used to validate daemon updates
UpdateStrategy: daemon.Strategy,
Storage: s,
}
return &REST{store}
}
/*
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 daemon
import (
"fmt"
"reflect"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/validation"
"k8s.io/kubernetes/pkg/fields"
"k8s.io/kubernetes/pkg/labels"
"k8s.io/kubernetes/pkg/registry/generic"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/util/fielderrors"
)
// daemonStrategy implements verification logic for daemons.
type daemonStrategy struct {
runtime.ObjectTyper
api.NameGenerator
}
// Strategy is the default logic that applies when creating and updating Daemon objects.
var Strategy = daemonStrategy{api.Scheme, api.SimpleNameGenerator}
// NamespaceScoped returns true because all Daemons need to be within a namespace.
func (daemonStrategy) NamespaceScoped() bool {
return true
}
// PrepareForCreate clears the status of a daemon before creation.
func (daemonStrategy) PrepareForCreate(obj runtime.Object) {
daemon := obj.(*api.Daemon)
daemon.Status = api.DaemonStatus{}
daemon.Generation = 1
}
// PrepareForUpdate clears fields that are not allowed to be set by end users on update.
func (daemonStrategy) PrepareForUpdate(obj, old runtime.Object) {
newDaemon := obj.(*api.Daemon)
oldDaemon := old.(*api.Daemon)
// Any changes to the spec increment the generation number, any changes to the
// status should reflect the generation number of the corresponding object. We push
// the burden of managing the status onto the clients because we can't (in general)
// know here what version of spec the writer of the status has seen. It may seem like
// we can at first -- since obj contains spec -- but in the future we will probably make
// status its own object, and even if we don't, writes may be the result of a
// read-update-write loop, so the contents of spec may not actually be the spec that
// the controller has *seen*.
//
// TODO: Any changes to a part of the object that represents desired state (labels,
// annotations etc) should also increment the generation.
if !reflect.DeepEqual(oldDaemon.Spec, newDaemon.Spec) {
newDaemon.Generation = oldDaemon.Generation + 1
}
}
// Validate validates a new daemon.
func (daemonStrategy) Validate(ctx api.Context, obj runtime.Object) fielderrors.ValidationErrorList {
daemon := obj.(*api.Daemon)
return validation.ValidateDaemon(daemon)
}
// AllowCreateOnUpdate is false for daemon; this means a POST is
// needed to create one
func (daemonStrategy) AllowCreateOnUpdate() bool {
return false
}
// ValidateUpdate is the default update validation for an end user.
func (daemonStrategy) ValidateUpdate(ctx api.Context, obj, old runtime.Object) fielderrors.ValidationErrorList {
validationErrorList := validation.ValidateDaemon(obj.(*api.Daemon))
updateErrorList := validation.ValidateDaemonUpdate(old.(*api.Daemon), obj.(*api.Daemon))
return append(validationErrorList, updateErrorList...)
}
// AllowUnconditionalUpdate is the default update policy for daemon objects.
func (daemonStrategy) AllowUnconditionalUpdate() bool {
return true
}
// DaemonToSelectableFields returns a field set that represents the object.
func DaemonToSelectableFields(daemon *api.Daemon) fields.Set {
return fields.Set{
"metadata.name": daemon.Name,
}
}
// MatchDaemon is the filter used by the generic etcd backend to route
// watch events from etcd to clients of the apiserver only interested in specific
// labels/fields.
func MatchDaemon(label labels.Selector, field fields.Selector) generic.Matcher {
return &generic.SelectionPredicate{
Label: label,
Field: field,
GetAttrs: func(obj runtime.Object) (labels.Set, fields.Set, error) {
daemon, ok := obj.(*api.Daemon)
if !ok {
return nil, nil, fmt.Errorf("given object is not a daemon.")
}
return labels.Set(daemon.ObjectMeta.Labels), DaemonToSelectableFields(daemon), nil
},
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment