Update godeps

vendor/k8s.io/kubernetes/pkg/api/meta/deep_copy_generated.go

@@ -1,154 +0,0 @@
-// +build !ignore_autogenerated
-
-/*
-Copyright 2016 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.
-*/
-
-// This file was autogenerated by deepcopy-gen. Do not edit it manually!
-
-package meta
-
-import (
-	unversioned "k8s.io/kubernetes/pkg/api/unversioned"
-	conversion "k8s.io/kubernetes/pkg/conversion"
-	runtime "k8s.io/kubernetes/pkg/runtime"
-)
-
-func DeepCopy_meta_DefaultRESTMapper(in DefaultRESTMapper, out *DefaultRESTMapper, c *conversion.Cloner) error {
-	if in.defaultGroupVersions != nil {
-		in, out := in.defaultGroupVersions, &out.defaultGroupVersions
-		*out = make([]unversioned.GroupVersion, len(in))
-		for i := range in {
-			if err := unversioned.DeepCopy_unversioned_GroupVersion(in[i], &(*out)[i], c); err != nil {
-				return err
-			}
-		}
-	} else {
-		out.defaultGroupVersions = nil
-	}
-	if in.resourceToKind != nil {
-		in, out := in.resourceToKind, &out.resourceToKind
-		*out = make(map[unversioned.GroupVersionResource]unversioned.GroupVersionKind)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported unversioned.GroupVersionResource
-		}
-	} else {
-		out.resourceToKind = nil
-	}
-	if in.kindToPluralResource != nil {
-		in, out := in.kindToPluralResource, &out.kindToPluralResource
-		*out = make(map[unversioned.GroupVersionKind]unversioned.GroupVersionResource)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported unversioned.GroupVersionKind
-		}
-	} else {
-		out.kindToPluralResource = nil
-	}
-	if in.kindToScope != nil {
-		in, out := in.kindToScope, &out.kindToScope
-		*out = make(map[unversioned.GroupVersionKind]RESTScope)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported unversioned.GroupVersionKind
-		}
-	} else {
-		out.kindToScope = nil
-	}
-	if in.singularToPlural != nil {
-		in, out := in.singularToPlural, &out.singularToPlural
-		*out = make(map[unversioned.GroupVersionResource]unversioned.GroupVersionResource)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported unversioned.GroupVersionResource
-		}
-	} else {
-		out.singularToPlural = nil
-	}
-	if in.pluralToSingular != nil {
-		in, out := in.pluralToSingular, &out.pluralToSingular
-		*out = make(map[unversioned.GroupVersionResource]unversioned.GroupVersionResource)
-		for range in {
-			// FIXME: Copying unassignable keys unsupported unversioned.GroupVersionResource
-		}
-	} else {
-		out.pluralToSingular = nil
-	}
-	if in.interfacesFunc == nil {
-		out.interfacesFunc = nil
-	} else if newVal, err := c.DeepCopy(in.interfacesFunc); err != nil {
-		return err
-	} else {
-		out.interfacesFunc = newVal.(VersionInterfacesFunc)
-	}
-	if in.aliasToResource != nil {
-		in, out := in.aliasToResource, &out.aliasToResource
-		*out = make(map[string][]string)
-		for key, val := range in {
-			if newVal, err := c.DeepCopy(val); err != nil {
-				return err
-			} else {
-				(*out)[key] = newVal.([]string)
-			}
-		}
-	} else {
-		out.aliasToResource = nil
-	}
-	return nil
-}
-
-func DeepCopy_meta_RESTMapping(in RESTMapping, out *RESTMapping, c *conversion.Cloner) error {
-	out.Resource = in.Resource
-	if err := unversioned.DeepCopy_unversioned_GroupVersionKind(in.GroupVersionKind, &out.GroupVersionKind, c); err != nil {
-		return err
-	}
-	if in.Scope == nil {
-		out.Scope = nil
-	} else if newVal, err := c.DeepCopy(in.Scope); err != nil {
-		return err
-	} else {
-		out.Scope = newVal.(RESTScope)
-	}
-	if in.ObjectConvertor == nil {
-		out.ObjectConvertor = nil
-	} else if newVal, err := c.DeepCopy(in.ObjectConvertor); err != nil {
-		return err
-	} else {
-		out.ObjectConvertor = newVal.(runtime.ObjectConvertor)
-	}
-	if in.MetadataAccessor == nil {
-		out.MetadataAccessor = nil
-	} else if newVal, err := c.DeepCopy(in.MetadataAccessor); err != nil {
-		return err
-	} else {
-		out.MetadataAccessor = newVal.(MetadataAccessor)
-	}
-	return nil
-}
-
-func DeepCopy_meta_VersionInterfaces(in VersionInterfaces, out *VersionInterfaces, c *conversion.Cloner) error {
-	if in.ObjectConvertor == nil {
-		out.ObjectConvertor = nil
-	} else if newVal, err := c.DeepCopy(in.ObjectConvertor); err != nil {
-		return err
-	} else {
-		out.ObjectConvertor = newVal.(runtime.ObjectConvertor)
-	}
-	if in.MetadataAccessor == nil {
-		out.MetadataAccessor = nil
-	} else if newVal, err := c.DeepCopy(in.MetadataAccessor); err != nil {
-		return err
-	} else {
-		out.MetadataAccessor = newVal.(MetadataAccessor)
-	}
-	return nil
-}

vendor/k8s.io/kubernetes/pkg/api/meta/interfaces.go

@@ -17,6 +17,7 @@ limitations under the License.
 package meta
 
 import (
+	"k8s.io/kubernetes/pkg/api/meta/metatypes"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/types"
@@ -57,25 +58,25 @@ type Object interface {
 	SetLabels(labels map[string]string)
 	GetAnnotations() map[string]string
 	SetAnnotations(annotations map[string]string)
+	GetFinalizers() []string
+	SetFinalizers(finalizers []string)
+	GetOwnerReferences() []metatypes.OwnerReference
+	SetOwnerReferences([]metatypes.OwnerReference)
+}
+
+var _ Object = &runtime.Unstructured{}
+
+type ListMetaAccessor interface {
+	GetListMeta() List
 }
 
 // List lets you work with list metadata from any of the versioned or
 // internal API objects. Attempting to set or retrieve a field on an object that does
 // not support that field will be a no-op and return a default value.
-type List interface {
-	GetResourceVersion() string
-	SetResourceVersion(version string)
-	GetSelfLink() string
-	SetSelfLink(selfLink string)
-}
+type List unversioned.List
 
 // Type exposes the type and APIVersion of versioned or internal API objects.
-type Type interface {
-	GetAPIVersion() string
-	SetAPIVersion(version string)
-	GetKind() string
-	SetKind(kind string)
-}
+type Type unversioned.Type
 
 // MetadataAccessor lets you work with object and list metadata from any of the versioned or
 // internal API objects. Attempting to set or retrieve a field on an object that does
@@ -177,5 +178,3 @@ type RESTMapper interface {
 	AliasesForResource(resource string) ([]string, bool)
 	ResourceSingularizer(resource string) (singular string, err error)
 }
-
-var _ Object = &runtime.Unstructured{}

vendor/k8s.io/kubernetes/pkg/api/meta/meta.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"reflect"
 
+	"k8s.io/kubernetes/pkg/api/meta/metatypes"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/conversion"
 	"k8s.io/kubernetes/pkg/runtime"
@@ -28,19 +29,58 @@ import (
 	"github.com/golang/glog"
 )
 
+func ListAccessor(obj interface{}) (List, error) {
+	if listMetaAccessor, ok := obj.(ListMetaAccessor); ok {
+		if om := listMetaAccessor.GetListMeta(); om != nil {
+			return om, nil
+		}
+	}
+	if listMetaAccessor, ok := obj.(unversioned.ListMetaAccessor); ok {
+		if om := listMetaAccessor.GetListMeta(); om != nil {
+			return om, nil
+		}
+	}
+	// we may get passed an object that is directly portable to List
+	if list, ok := obj.(List); ok {
+		return list, nil
+	}
+	glog.V(4).Infof("Calling ListAccessor on non-internal object: %v", reflect.TypeOf(obj))
+	// legacy path for objects that do not implement List and ListMetaAccessor via
+	// reflection - very slow code path.
+	v, err := conversion.EnforcePtr(obj)
+	if err != nil {
+		return nil, err
+	}
+	t := v.Type()
+	if v.Kind() != reflect.Struct {
+		return nil, fmt.Errorf("expected struct, but got %v: %v (%#v)", v.Kind(), t, v.Interface())
+	}
+	a := &genericAccessor{}
+	listMeta := v.FieldByName("ListMeta")
+	if listMeta.IsValid() {
+		// look for the ListMeta fields
+		if err := extractFromListMeta(listMeta, a); err != nil {
+			return nil, fmt.Errorf("unable to find list fields on %#v: %v", listMeta, err)
+		}
+	} else {
+		return nil, fmt.Errorf("unable to find listMeta on %#v", v)
+	}
+	return a, nil
+}
+
 // Accessor takes an arbitrary object pointer and returns meta.Interface.
 // obj must be a pointer to an API type. An error is returned if the minimum
 // required fields are missing. Fields that are not required return the default
 // value and are a no-op if set.
 func Accessor(obj interface{}) (Object, error) {
-	if oi, ok := obj.(ObjectMetaAccessor); ok {
-		if om := oi.GetObjectMeta(); om != nil {
+	if objectMetaAccessor, ok := obj.(ObjectMetaAccessor); ok {
+		if om := objectMetaAccessor.GetObjectMeta(); om != nil {
 			return om, nil
 		}
 	}
 	// we may get passed an object that is directly portable to Object
-	if oi, ok := obj.(Object); ok {
-		return oi, nil
+	if object, ok := obj.(Object); ok {
+		return object, nil
 	}
 
 	glog.V(4).Infof("Calling Accessor on non-internal object: %v", reflect.TypeOf(obj))
@@ -123,33 +163,21 @@ type objectAccessor struct {
 }
 
 func (obj objectAccessor) GetKind() string {
-	if gvk := obj.GetObjectKind().GroupVersionKind(); gvk != nil {
-		return gvk.Kind
-	}
-	return ""
+	return obj.GetObjectKind().GroupVersionKind().Kind
 }
 
 func (obj objectAccessor) SetKind(kind string) {
 	gvk := obj.GetObjectKind().GroupVersionKind()
-	if gvk == nil {
-		gvk = &unversioned.GroupVersionKind{}
-	}
 	gvk.Kind = kind
 	obj.GetObjectKind().SetGroupVersionKind(gvk)
 }
 
 func (obj objectAccessor) GetAPIVersion() string {
-	if gvk := obj.GetObjectKind().GroupVersionKind(); gvk != nil {
-		return gvk.GroupVersion().String()
-	}
-	return ""
+	return obj.GetObjectKind().GroupVersionKind().GroupVersion().String()
 }
 
 func (obj objectAccessor) SetAPIVersion(version string) {
 	gvk := obj.GetObjectKind().GroupVersionKind()
-	if gvk == nil {
-		gvk = &unversioned.GroupVersionKind{}
-	}
 	gv, err := unversioned.ParseGroupVersion(version)
 	if err != nil {
 		gv = unversioned.GroupVersion{Version: version}
@@ -322,6 +350,54 @@ func (resourceAccessor) SetResourceVersion(obj runtime.Object, version string) e
 	return nil
 }
 
+// extractFromOwnerReference extracts v to o. v is the OwnerReferences field of an object.
+func extractFromOwnerReference(v reflect.Value, o *metatypes.OwnerReference) error {
+	if err := runtime.Field(v, "APIVersion", &o.APIVersion); err != nil {
+		return err
+	}
+	if err := runtime.Field(v, "Kind", &o.Kind); err != nil {
+		return err
+	}
+	if err := runtime.Field(v, "Name", &o.Name); err != nil {
+		return err
+	}
+	if err := runtime.Field(v, "UID", &o.UID); err != nil {
+		return err
+	}
+	var controllerPtr *bool
+	if err := runtime.Field(v, "Controller", &controllerPtr); err != nil {
+		return err
+	}
+	if controllerPtr != nil {
+		controller := *controllerPtr
+		o.Controller = &controller
+	}
+	return nil
+}
+
+// setOwnerReference sets v to o. v is the OwnerReferences field of an object.
+func setOwnerReference(v reflect.Value, o *metatypes.OwnerReference) error {
+	if err := runtime.SetField(o.APIVersion, v, "APIVersion"); err != nil {
+		return err
+	}
+	if err := runtime.SetField(o.Kind, v, "Kind"); err != nil {
+		return err
+	}
+	if err := runtime.SetField(o.Name, v, "Name"); err != nil {
+		return err
+	}
+	if err := runtime.SetField(o.UID, v, "UID"); err != nil {
+		return err
+	}
+	if o.Controller != nil {
+		controller := *(o.Controller)
+		if err := runtime.SetField(&controller, v, "Controller"); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // genericAccessor contains pointers to strings that can modify an arbitrary
 // struct and implements the Accessor interface.
 type genericAccessor struct {
@@ -337,6 +413,8 @@ type genericAccessor struct {
 	deletionTimestamp **unversioned.Time
 	labels            *map[string]string
 	annotations       *map[string]string
+	ownerReferences   reflect.Value
+	finalizers        *[]string
 }
 
 func (a genericAccessor) GetNamespace() string {
@@ -469,6 +547,52 @@ func (a genericAccessor) SetAnnotations(annotations map[string]string) {
 	*a.annotations = annotations
 }
 
+func (a genericAccessor) GetFinalizers() []string {
+	if a.finalizers == nil {
+		return nil
+	}
+	return *a.finalizers
+}
+
+func (a genericAccessor) SetFinalizers(finalizers []string) {
+	*a.finalizers = finalizers
+}
+
+func (a genericAccessor) GetOwnerReferences() []metatypes.OwnerReference {
+	var ret []metatypes.OwnerReference
+	s := a.ownerReferences
+	if s.Kind() != reflect.Ptr || s.Elem().Kind() != reflect.Slice {
+		glog.Errorf("expect %v to be a pointer to slice", s)
+		return ret
+	}
+	s = s.Elem()
+	// Set the capacity to one element greater to avoid copy if the caller later append an element.
+	ret = make([]metatypes.OwnerReference, s.Len(), s.Len()+1)
+	for i := 0; i < s.Len(); i++ {
+		if err := extractFromOwnerReference(s.Index(i), &ret[i]); err != nil {
+			glog.Errorf("extractFromOwnerReference failed: %v", err)
+			return ret
+		}
+	}
+	return ret
+}
+
+func (a genericAccessor) SetOwnerReferences(references []metatypes.OwnerReference) {
+	s := a.ownerReferences
+	if s.Kind() != reflect.Ptr || s.Elem().Kind() != reflect.Slice {
+		glog.Errorf("expect %v to be a pointer to slice", s)
+	}
+	s = s.Elem()
+	newReferences := reflect.MakeSlice(s.Type(), len(references), len(references))
+	for i := 0; i < len(references); i++ {
+		if err := setOwnerReference(newReferences.Index(i), &references[i]); err != nil {
+			glog.Errorf("setOwnerReference failed: %v", err)
+			return
+		}
+	}
+	s.Set(newReferences)
+}
+
 // extractFromTypeMeta extracts pointers to version and kind fields from an object
 func extractFromTypeMeta(v reflect.Value, a *genericAccessor) error {
 	if err := runtime.FieldPtr(v, "APIVersion", &a.apiVersion); err != nil {
@@ -506,6 +630,17 @@ func extractFromObjectMeta(v reflect.Value, a *genericAccessor) error {
 	if err := runtime.FieldPtr(v, "Annotations", &a.annotations); err != nil {
 		return err
 	}
+	if err := runtime.FieldPtr(v, "Finalizers", &a.finalizers); err != nil {
+		return err
+	}
+	ownerReferences := v.FieldByName("OwnerReferences")
+	if !ownerReferences.IsValid() {
+		return fmt.Errorf("struct %#v lacks OwnerReferences type", v)
+	}
+	if ownerReferences.Kind() != reflect.Slice {
+		return fmt.Errorf("expect %v to be a slice", ownerReferences.Kind())
+	}
+	a.ownerReferences = ownerReferences.Addr()
 	return nil
 }
 

vendor/k8s.io/kubernetes/pkg/api/meta/metatypes/types.go

@@ -0,0 +1,30 @@
+/*
+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.
+*/
+
+// The types defined in this package are used by the meta package to represent
+// the in-memory version of objects. We cannot reuse the __internal version of
+// API objects because it causes import cycle.
+package metatypes
+
+import "k8s.io/kubernetes/pkg/types"
+
+type OwnerReference struct {
+	APIVersion string
+	Kind       string
+	UID        types.UID
+	Name       string
+	Controller *bool
+}