Merge pull request #23472 from wojtek-t/fix_object_meta_for

Automatic merge from submit-queue

Switch from api.ObjectMetaFor to meta.Accessor in most of places

Fix #23278

@smarterclayton @lavalamp

pkg/api/meta.go

@@ -39,6 +39,7 @@ func HasObjectMetaSystemFieldValues(meta *ObjectMeta) bool {
 
 // ObjectMetaFor returns a pointer to a provided object's ObjectMeta.
 // TODO: allow runtime.Unknown to extract this object
+// TODO: Remove this function and use meta.Accessor() instead.
 func ObjectMetaFor(obj runtime.Object) (*ObjectMeta, error) {
 	v, err := conversion.EnforcePtr(obj)
 	if err != nil {
@@ -64,18 +65,26 @@ func ListMetaFor(obj runtime.Object) (*unversioned.ListMeta, error) {
 
 // Namespace implements meta.Object for any object with an ObjectMeta typed field. Allows
 // fast, direct access to metadata fields for API objects.
-func (meta *ObjectMeta) GetNamespace() string                         { return meta.Namespace }
-func (meta *ObjectMeta) SetNamespace(namespace string)                { meta.Namespace = namespace }
-func (meta *ObjectMeta) GetName() string                              { return meta.Name }
-func (meta *ObjectMeta) SetName(name string)                          { meta.Name = name }
-func (meta *ObjectMeta) GetGenerateName() string                      { return meta.GenerateName }
-func (meta *ObjectMeta) SetGenerateName(generateName string)          { meta.GenerateName = generateName }
-func (meta *ObjectMeta) GetUID() types.UID                            { return meta.UID }
-func (meta *ObjectMeta) SetUID(uid types.UID)                         { meta.UID = uid }
-func (meta *ObjectMeta) GetResourceVersion() string                   { return meta.ResourceVersion }
-func (meta *ObjectMeta) SetResourceVersion(version string)            { meta.ResourceVersion = version }
-func (meta *ObjectMeta) GetSelfLink() string                          { return meta.SelfLink }
-func (meta *ObjectMeta) SetSelfLink(selfLink string)                  { meta.SelfLink = selfLink }
+func (meta *ObjectMeta) GetNamespace() string                   { return meta.Namespace }
+func (meta *ObjectMeta) SetNamespace(namespace string)          { meta.Namespace = namespace }
+func (meta *ObjectMeta) GetName() string                        { return meta.Name }
+func (meta *ObjectMeta) SetName(name string)                    { meta.Name = name }
+func (meta *ObjectMeta) GetGenerateName() string                { return meta.GenerateName }
+func (meta *ObjectMeta) SetGenerateName(generateName string)    { meta.GenerateName = generateName }
+func (meta *ObjectMeta) GetUID() types.UID                      { return meta.UID }
+func (meta *ObjectMeta) SetUID(uid types.UID)                   { meta.UID = uid }
+func (meta *ObjectMeta) GetResourceVersion() string             { return meta.ResourceVersion }
+func (meta *ObjectMeta) SetResourceVersion(version string)      { meta.ResourceVersion = version }
+func (meta *ObjectMeta) GetSelfLink() string                    { return meta.SelfLink }
+func (meta *ObjectMeta) SetSelfLink(selfLink string)            { meta.SelfLink = selfLink }
+func (meta *ObjectMeta) GetCreationTimestamp() unversioned.Time { return meta.CreationTimestamp }
+func (meta *ObjectMeta) SetCreationTimestamp(creationTimestamp unversioned.Time) {
+	meta.CreationTimestamp = creationTimestamp
+}
+func (meta *ObjectMeta) GetDeletionTimestamp() *unversioned.Time { return meta.DeletionTimestamp }
+func (meta *ObjectMeta) SetDeletionTimestamp(deletionTimestamp *unversioned.Time) {
+	meta.DeletionTimestamp = deletionTimestamp
+}
 func (meta *ObjectMeta) GetLabels() map[string]string                 { return meta.Labels }
 func (meta *ObjectMeta) SetLabels(labels map[string]string)           { meta.Labels = labels }
 func (meta *ObjectMeta) GetAnnotations() map[string]string            { return meta.Annotations }

pkg/api/meta/interfaces.go

@@ -49,6 +49,10 @@ type Object interface {
 	SetResourceVersion(version string)
 	GetSelfLink() string
 	SetSelfLink(selfLink string)
+	GetCreationTimestamp() unversioned.Time
+	SetCreationTimestamp(timestamp unversioned.Time)
+	GetDeletionTimestamp() *unversioned.Time
+	SetDeletionTimestamp(timestamp *unversioned.Time)
 	GetLabels() map[string]string
 	SetLabels(labels map[string]string)
 	GetAnnotations() map[string]string

pkg/api/meta/meta.go

@@ -24,6 +24,8 @@ import (
 	"k8s.io/kubernetes/pkg/conversion"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/types"
+
+	"github.com/golang/glog"
 )
 
 // Accessor takes an arbitrary object pointer and returns meta.Interface.
@@ -40,6 +42,8 @@ func Accessor(obj interface{}) (Object, error) {
 	if oi, ok := obj.(Object); ok {
 		return oi, nil
 	}
+
+	glog.V(4).Infof("Calling Accessor on non-internal object: %v", reflect.TypeOf(obj))
 	// legacy path for objects that do not implement Object and ObjectMetaAccessor via
 	// reflection - very slow code path.
 	v, err := conversion.EnforcePtr(obj)
@@ -321,16 +325,18 @@ func (resourceAccessor) SetResourceVersion(obj runtime.Object, version string) e
 // genericAccessor contains pointers to strings that can modify an arbitrary
 // struct and implements the Accessor interface.
 type genericAccessor struct {
-	namespace       *string
-	name            *string
-	generateName    *string
-	uid             *types.UID
-	apiVersion      *string
-	kind            *string
-	resourceVersion *string
-	selfLink        *string
-	labels          *map[string]string
-	annotations     *map[string]string
+	namespace         *string
+	name              *string
+	generateName      *string
+	uid               *types.UID
+	apiVersion        *string
+	kind              *string
+	resourceVersion   *string
+	selfLink          *string
+	creationTimestamp *unversioned.Time
+	deletionTimestamp **unversioned.Time
+	labels            *map[string]string
+	annotations       *map[string]string
 }
 
 func (a genericAccessor) GetNamespace() string {
@@ -421,6 +427,22 @@ func (a genericAccessor) SetSelfLink(selfLink string) {
 	*a.selfLink = selfLink
 }
 
+func (a genericAccessor) GetCreationTimestamp() unversioned.Time {
+	return *a.creationTimestamp
+}
+
+func (a genericAccessor) SetCreationTimestamp(timestamp unversioned.Time) {
+	*a.creationTimestamp = timestamp
+}
+
+func (a genericAccessor) GetDeletionTimestamp() *unversioned.Time {
+	return *a.deletionTimestamp
+}
+
+func (a genericAccessor) SetDeletionTimestamp(timestamp *unversioned.Time) {
+	*a.deletionTimestamp = timestamp
+}
+
 func (a genericAccessor) GetLabels() map[string]string {
 	if a.labels == nil {
 		return nil