Add registry code

pkg/registry/daemon/doc.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 daemon provides Registry interface and it's RESTStorage
+// implementation for storing Daemon api objects.
+package daemon

pkg/registry/daemon/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 (
+	"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}
+}

pkg/registry/daemon/rest.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 daemon
+
+import (
+	"fmt"
+	"reflect"
+	"strconv"
+
+	"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...)
+}
+
+func (daemonStrategy) AllowUnconditionalUpdate() bool {
+	return true
+}
+
+// DaemonToSelectableFields returns a label set that represents the object.
+func DaemonToSelectableFields(daemon *api.Daemon) fields.Set {
+	return fields.Set{
+		"metadata.name":                 daemon.Name,
+		"status.currentNumberScheduled": strconv.Itoa(daemon.Status.CurrentNumberScheduled),
+		"status.numberMisscheduled":     strconv.Itoa(daemon.Status.NumberMisscheduled),
+		"status.desiredNumberScheduled": strconv.Itoa(daemon.Status.DesiredNumberScheduled),
+	}
+}
+
+// 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
+		},
+	}
+}

pkg/registry/generic/etcd/etcd.go

@@ -273,7 +273,7 @@ func (e *Etcd) Update(ctx api.Context, obj runtime.Object) (runtime.Object, bool
 				return nil, nil, err
 			}
 			if newVersion != version {
-				return nil, nil, kubeerr.NewConflict(e.EndpointName, name, fmt.Errorf("the object has been modified; please apply your changes to the latest version and try again"))
+				return nil, nil, kubeerr.NewConflict(e.EndpointName, name, fmt.Errorf("the object has been modified; please apply your changes to the latest version and try again %+v, %+v", version, newVersion))
 			}
 		}
 		if err := rest.BeforeUpdate(e.UpdateStrategy, ctx, obj, existing); err != nil {