boring: simple method moves

examples/examples_test.go

@@ -179,13 +179,13 @@ func validateObject(path string, obj runtime.Object, t *testing.T) {
 		}
 
 		if namespaceRequired {
-			objectMeta, objectMetaErr := metav1.ObjectMetaFor(obj)
+			objectMeta, objectMetaErr := meta.Accessor(obj)
 			if objectMetaErr != nil {
 				t.Errorf("Expected no error, Got %v", objectMetaErr)
 				return
 			}
 
-			objectMeta.Namespace = metav1.NamespaceDefault
+			objectMeta.SetNamespace(metav1.NamespaceDefault)
 		}
 	}
 

pkg/api/graph/types.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/gonum/graph"
 
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 )
 
@@ -24,12 +24,12 @@ const (
 )
 
 func GetUniqueRuntimeObjectNodeName(nodeKind string, obj runtime.Object) UniqueName {
-	meta, err := metav1.ObjectMetaFor(obj)
+	meta, err := meta.Accessor(obj)
 	if err != nil {
 		panic(err)
 	}
 
-	return UniqueName(fmt.Sprintf("%s|%s/%s", nodeKind, meta.Namespace, meta.Name))
+	return UniqueName(fmt.Sprintf("%s|%s/%s", nodeKind, meta.GetNamespace(), meta.GetName()))
 }
 
 // GetTopLevelContainerNode traverses the reverse ContainsEdgeKind edges until it finds a node

pkg/api/kubegraph/edge_test.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/gonum/graph"
 
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	kapi "k8s.io/kubernetes/pkg/api"
@@ -80,11 +81,11 @@ func namespaceFor(node graph.Node) (string, error) {
 	obj := node.(objectifier).Object()
 	switch t := obj.(type) {
 	case runtime.Object:
-		meta, err := metav1.ObjectMetaFor(t)
+		meta, err := meta.Accessor(t)
 		if err != nil {
 			return "", err
 		}
-		return meta.Namespace, nil
+		return meta.GetNamespace(), nil
 	case *kapi.PodSpec:
 		return node.(*kubegraph.PodSpecNode).Namespace, nil
 	case *kapi.ReplicationControllerSpec:

pkg/api/kubegraph/edges.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/gonum/graph"
 
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -130,7 +131,7 @@ func AddMountedSecretEdges(g osgraph.Graph, podSpec *kubegraph.PodSpecNode) {
 	containerNode := osgraph.GetTopLevelContainerNode(g, podSpec)
 	containerObj := g.GraphDescriber.Object(containerNode)
 
-	meta, err := metav1.ObjectMetaFor(containerObj.(runtime.Object))
+	meta, err := meta.Accessor(containerObj.(runtime.Object))
 	if err != nil {
 		// this should never happen.  it means that a podSpec is owned by a top level container that is not a runtime.Object
 		panic(err)
@@ -144,7 +145,7 @@ func AddMountedSecretEdges(g osgraph.Graph, podSpec *kubegraph.PodSpecNode) {
 
 		// pod secrets must be in the same namespace
 		syntheticSecret := &kapi.Secret{}
-		syntheticSecret.Namespace = meta.Namespace
+		syntheticSecret.Namespace = meta.GetNamespace()
 		syntheticSecret.Name = source.Secret.SecretName
 
 		secretNode := kubegraph.FindOrCreateSyntheticSecretNode(g, syntheticSecret)
@@ -184,7 +185,7 @@ func AddRequestedServiceAccountEdges(g osgraph.Graph, podSpecNode *kubegraph.Pod
 	containerNode := osgraph.GetTopLevelContainerNode(g, podSpecNode)
 	containerObj := g.GraphDescriber.Object(containerNode)
 
-	meta, err := metav1.ObjectMetaFor(containerObj.(runtime.Object))
+	meta, err := meta.Accessor(containerObj.(runtime.Object))
 	if err != nil {
 		panic(err)
 	}
@@ -196,7 +197,7 @@ func AddRequestedServiceAccountEdges(g osgraph.Graph, podSpecNode *kubegraph.Pod
 	}
 
 	syntheticSA := &kapi.ServiceAccount{}
-	syntheticSA.Namespace = meta.Namespace
+	syntheticSA.Namespace = meta.GetNamespace()
 	syntheticSA.Name = name
 
 	saNode := kubegraph.FindOrCreateSyntheticServiceAccountNode(g, syntheticSA)

pkg/api/restmapper/discovery.go

@@ -158,14 +158,6 @@ func (d *discoveryRESTMapper) RESTMappings(gk schema.GroupKind, versions ...stri
 	return delegate.RESTMappings(gk, versions...)
 }
 
-func (d *discoveryRESTMapper) AliasesForResource(resource string) ([]string, bool) {
-	delegate, err := d.getDelegate()
-	if err != nil {
-		return nil, false
-	}
-	return delegate.AliasesForResource(resource)
-}
-
 func (d *discoveryRESTMapper) ResourceSingularizer(resource string) (singular string, err error) {
 	delegate, err := d.getDelegate()
 	if err != nil {

pkg/api/serialization_test.go

@@ -370,8 +370,8 @@ func originFuzzer(t *testing.T, seed int64) *fuzz.Fuzzer {
 					}
 				}
 				if c.RandBool() {
-					params.MaxUnavailable = intstr.FromInt(c.Rand.Int())
-					params.MaxSurge = intstr.FromInt(c.Rand.Int())
+					params.MaxUnavailable = intstr.FromInt(int(c.Rand.Int31()))
+					params.MaxSurge = intstr.FromInt(int(c.Rand.Int31()))
 				} else {
 					params.MaxSurge = intstr.FromString(fmt.Sprintf("%d%%", c.RandUint64()))
 					params.MaxUnavailable = intstr.FromString(fmt.Sprintf("%d%%", c.RandUint64()))

pkg/auth/ldaputil/client.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net"
 
-	utilnet "k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/client-go/util/cert"
 
 	"github.com/openshift/origin/pkg/auth/ldaputil/ldapclient"
@@ -67,7 +66,7 @@ func (l *ldapClientConfig) Connect() (ldap.Client, error) {
 	// Ensure tlsConfig specifies the server we're connecting to
 	if tlsConfig != nil && !tlsConfig.InsecureSkipVerify && len(tlsConfig.ServerName) == 0 {
 		// Add to a copy of the tlsConfig to avoid mutating the original
-		c := utilnet.CloneTLSConfig(tlsConfig)
+		c := tlsConfig.Clone()
 		if host, _, err := net.SplitHostPort(l.host); err == nil {
 			c.ServerName = host
 		} else {

pkg/authorization/apis/authorization/v1/defaults.go

@@ -1,8 +1,7 @@
 package v1
 
 import (
-	"k8s.io/apimachinery/pkg/runtime"
-	kapi "k8s.io/kubernetes/pkg/api"
+	kapihelper "k8s.io/kubernetes/pkg/api/helper"
 
 	internal "github.com/openshift/origin/pkg/authorization/apis/authorization"
 )
@@ -23,7 +22,7 @@ func SetDefaults_PolicyRule(obj *PolicyRule) {
 		len(obj.NonResourceURLsSlice) == 0 &&
 		// semantic equalities will ignore nil vs empty for other fields as a safety
 		// DO NOT REMOVE THIS CHECK unless you replace it with full equality comparisons
-		kapi.Semantic.Equalities.DeepEqual(oldAllowAllPolicyRule, *obj)
+		kapihelper.Semantic.Equalities.DeepEqual(oldAllowAllPolicyRule, *obj)
 
 	if oldAllowAllRule {
 		obj.APIGroups = []string{internal.APIGroupAll}
@@ -34,10 +33,3 @@ func SetDefaults_PolicyRule(obj *PolicyRule) {
 		obj.APIGroups = []string{""}
 	}
 }
-
-func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	RegisterDefaults(scheme)
-	return scheme.AddDefaultingFuncs(
-		SetDefaults_PolicyRule,
-	)
-}

pkg/authorization/apis/authorization/v1/register.go

@@ -15,13 +15,17 @@ var (
 	SchemeGroupVersion       = schema.GroupVersion{Group: GroupName, Version: "v1"}
 	LegacySchemeGroupVersion = schema.GroupVersion{Group: LegacyGroupName, Version: "v1"}
 
-	LegacySchemeBuilder    = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs, addDefaultingFuncs)
+	LegacySchemeBuilder    = runtime.NewSchemeBuilder(addLegacyKnownTypes, addConversionFuncs, RegisterDefaults)
 	AddToSchemeInCoreGroup = LegacySchemeBuilder.AddToScheme
 
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, addDefaultingFuncs)
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, RegisterDefaults)
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 
+func Resource(resource string) schema.GroupResource {
+	return SchemeGroupVersion.WithResource(resource).GroupResource()
+}
+
 // Adds the list of known types to api.Scheme.
 func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,

pkg/authorization/apis/authorization/validation/validation.go

@@ -9,6 +9,7 @@ import (
 	kvalidation "k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/apimachinery/pkg/util/validation/field"
 	kapi "k8s.io/kubernetes/pkg/api"
+	kapihelper "k8s.io/kubernetes/pkg/api/helper"
 	"k8s.io/kubernetes/pkg/api/validation"
 
 	authorizationapi "github.com/openshift/origin/pkg/authorization/apis/authorization"
@@ -304,7 +305,7 @@ func validateRoleUpdate(role *authorizationapi.Role, oldRole *authorizationapi.R
 
 func isNewRule(rule authorizationapi.PolicyRule, oldRole *authorizationapi.Role) bool {
 	for _, r := range oldRole.Rules {
-		if r.AttributeRestrictions != nil && kapi.Semantic.DeepEqual(rule, r) { // only do expensive comparision against rules that have attribute restrictions
+		if r.AttributeRestrictions != nil && kapihelper.Semantic.DeepEqual(rule, r) { // only do expensive comparision against rules that have attribute restrictions
 			return false
 		}
 	}

pkg/authorization/registry/clusterpolicy/registry.go

@@ -64,7 +64,7 @@ func (s *storage) ListClusterPolicies(ctx apirequest.Context, options *metainter
 }
 
 func (s *storage) CreateClusterPolicy(ctx apirequest.Context, policy *authorizationapi.ClusterPolicy) error {
-	_, err := s.Create(ctx, policy)
+	_, err := s.Create(ctx, policy, false)
 	return err
 }
 

pkg/authorization/registry/clusterpolicy/strategy.go

@@ -67,12 +67,12 @@ func (strategy) ValidateUpdate(ctx apirequest.Context, obj, old runtime.Object)
 }
 
 // GetAttrs returns labels and fields of a given object for filtering purposes
-func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
+func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, bool, error) {
 	policy, ok := obj.(*authorizationapi.ClusterPolicy)
 	if !ok {
-		return nil, nil, fmt.Errorf("not a ClusterPolicy")
+		return nil, nil, false, fmt.Errorf("not a ClusterPolicy")
 	}
-	return labels.Set(policy.ObjectMeta.Labels), authorizationapi.ClusterPolicyToSelectableFields(policy), nil
+	return labels.Set(policy.ObjectMeta.Labels), authorizationapi.ClusterPolicyToSelectableFields(policy), policy.Initializers != nil, nil
 }
 
 // Matcher returns a generic matcher for a given label and field selector.

pkg/authorization/registry/clusterpolicybinding/registry.go

@@ -64,7 +64,7 @@ func (s *storage) ListClusterPolicyBindings(ctx apirequest.Context, options *met
 }
 
 func (s *storage) CreateClusterPolicyBinding(ctx apirequest.Context, policyBinding *authorizationapi.ClusterPolicyBinding) error {
-	_, err := s.Create(ctx, policyBinding)
+	_, err := s.Create(ctx, policyBinding, false)
 	return err
 }
 

pkg/authorization/registry/clusterpolicybinding/strategy.go

@@ -83,12 +83,12 @@ func (strategy) ValidateUpdate(ctx apirequest.Context, obj, old runtime.Object)
 }
 
 // GetAttrs returns labels and fields of a given object for filtering purposes
-func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
+func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, bool, error) {
 	policyBinding, ok := obj.(*authorizationapi.ClusterPolicyBinding)
 	if !ok {
-		return nil, nil, fmt.Errorf("not a ClusterPolicyBinding")
+		return nil, nil, false, fmt.Errorf("not a ClusterPolicyBinding")
 	}
-	return labels.Set(policyBinding.ObjectMeta.Labels), authorizationapi.ClusterPolicyBindingToSelectableFields(policyBinding), nil
+	return labels.Set(policyBinding.ObjectMeta.Labels), authorizationapi.ClusterPolicyBindingToSelectableFields(policyBinding), policyBinding.Initializers != nil, nil
 }
 
 // Matcher returns a generic matcher for a given label and field selector.

pkg/authorization/registry/clusterrole/proxy/proxy.go

@@ -66,11 +66,11 @@ func (s *ClusterRoleStorage) Delete(ctx apirequest.Context, name string, options
 	return ret.(*metav1.Status), false, err
 }
 
-func (s *ClusterRoleStorage) Create(ctx apirequest.Context, obj runtime.Object) (runtime.Object, error) {
+func (s *ClusterRoleStorage) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runtime.Object, error) {
 	clusterObj := obj.(*authorizationapi.ClusterRole)
 	convertedObj := authorizationapi.ToRole(clusterObj)
 
-	ret, err := s.roleStorage.Create(ctx, convertedObj)
+	ret, err := s.roleStorage.Create(ctx, convertedObj, false)
 	if ret == nil {
 		return nil, err
 	}

pkg/authorization/registry/clusterrolebinding/proxy/proxy.go

@@ -66,11 +66,11 @@ func (s *ClusterRoleBindingStorage) Delete(ctx apirequest.Context, name string,
 	return ret.(*metav1.Status), false, err
 }
 
-func (s *ClusterRoleBindingStorage) Create(ctx apirequest.Context, obj runtime.Object) (runtime.Object, error) {
+func (s *ClusterRoleBindingStorage) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runtime.Object, error) {
 	clusterObj := obj.(*authorizationapi.ClusterRoleBinding)
 	convertedObj := authorizationapi.ToRoleBinding(clusterObj)
 
-	ret, err := s.roleBindingStorage.Create(ctx, convertedObj)
+	ret, err := s.roleBindingStorage.Create(ctx, convertedObj, false)
 	if ret == nil {
 		return nil, err
 	}

pkg/authorization/registry/localresourceaccessreview/rest.go

@@ -28,7 +28,7 @@ func (r *REST) New() runtime.Object {
 
 // Create transforms a LocalRAR into an ClusterRAR that is requesting a namespace.  That collapses the code paths.
 // LocalResourceAccessReview exists to allow clean expression of policy.
-func (r *REST) Create(ctx apirequest.Context, obj runtime.Object) (runtime.Object, error) {
+func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runtime.Object, error) {
 	localRAR, ok := obj.(*authorizationapi.LocalResourceAccessReview)
 	if !ok {
 		return nil, kapierrors.NewBadRequest(fmt.Sprintf("not a localResourceAccessReview: %#v", obj))

pkg/authorization/registry/localresourceaccessreview/rest_test.go

@@ -74,7 +74,7 @@ func TestConflictingNamespace(t *testing.T) {
 
 	storage := NewREST(resourceaccessreview.NewRegistry(resourceaccessreview.NewREST(authorizer, authorizer)))
 	ctx := apirequest.WithNamespace(apirequest.NewContext(), "bar")
-	_, err := storage.Create(ctx, reviewRequest)
+	_, err := storage.Create(ctx, reviewRequest, false)
 	if err == nil {
 		t.Fatalf("unexpected non-error: %v", err)
 	}
@@ -131,7 +131,7 @@ func (r *resourceAccessTest) runTest(t *testing.T) {
 	expectedAttributes := authorizer.ToDefaultAuthorizationAttributes(nil, r.reviewRequest.Action.Namespace, r.reviewRequest.Action)
 
 	ctx := apirequest.WithNamespace(apirequest.WithUser(apirequest.NewContext(), &user.DefaultInfo{}), r.reviewRequest.Action.Namespace)
-	obj, err := storage.Create(ctx, r.reviewRequest)
+	obj, err := storage.Create(ctx, r.reviewRequest, false)
 	if err != nil && len(r.authorizer.err) == 0 {
 		t.Fatalf("unexpected error: %v", err)
 	}

pkg/authorization/registry/localsubjectaccessreview/rest.go

@@ -28,7 +28,7 @@ func (r *REST) New() runtime.Object {
 
 // Create transforms a LocalSAR into an ClusterSAR that is requesting a namespace.  That collapses the code paths.
 // LocalSubjectAccessReview exists to allow clean expression of policy.
-func (r *REST) Create(ctx apirequest.Context, obj runtime.Object) (runtime.Object, error) {
+func (r *REST) Create(ctx apirequest.Context, obj runtime.Object, _ bool) (runtime.Object, error) {
 	localSAR, ok := obj.(*authorizationapi.LocalSubjectAccessReview)
 	if !ok {
 		return nil, kapierrors.NewBadRequest(fmt.Sprintf("not a localSubjectAccessReview: %#v", obj))

pkg/authorization/registry/localsubjectaccessreview/rest_test.go

@@ -86,7 +86,7 @@ func TestConflictingNamespace(t *testing.T) {
 
 	storage := NewREST(subjectaccessreview.NewRegistry(subjectaccessreview.NewREST(authorizer)))
 	ctx := apirequest.WithNamespace(apirequest.NewContext(), "bar")
-	_, err := storage.Create(ctx, reviewRequest)
+	_, err := storage.Create(ctx, reviewRequest, false)
 	if err == nil {
 		t.Fatalf("unexpected non-error: %v", err)
 	}
@@ -271,7 +271,7 @@ func (r *subjectAccessTest) runTest(t *testing.T) {
 		ctx = apirequest.WithUser(ctx, &user.DefaultInfo{Name: "dummy"})
 	}
 
-	obj, err := storage.Create(ctx, r.reviewRequest)
+	obj, err := storage.Create(ctx, r.reviewRequest, false)
 	switch {
 	case err == nil && len(r.expectedError) == 0:
 	case err == nil && len(r.expectedError) != 0:

pkg/authorization/registry/policy/registry.go

@@ -59,7 +59,7 @@ func (s *storage) ListPolicies(ctx apirequest.Context, options *metainternal.Lis
 }
 
 func (s *storage) CreatePolicy(ctx apirequest.Context, node *authorizationapi.Policy) error {
-	_, err := s.Create(ctx, node)
+	_, err := s.Create(ctx, node, false)
 	return err
 }
 

pkg/authorization/registry/policy/strategy.go

@@ -68,12 +68,12 @@ func (strategy) ValidateUpdate(ctx apirequest.Context, obj, old runtime.Object)
 }
 
 // GetAttrs returns labels and fields of a given object for filtering purposes
-func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
+func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, bool, error) {
 	policy, ok := obj.(*authorizationapi.Policy)
 	if !ok {
-		return nil, nil, fmt.Errorf("not a Policy")
+		return nil, nil, false, fmt.Errorf("not a Policy")
 	}
-	return labels.Set(policy.ObjectMeta.Labels), authorizationapi.PolicyToSelectableFields(policy), nil
+	return labels.Set(policy.ObjectMeta.Labels), authorizationapi.PolicyToSelectableFields(policy), policy.Initializers != nil, nil
 }
 
 // Matcher returns a generic matcher for a given label and field selector.

pkg/authorization/registry/policybinding/registry.go

@@ -59,7 +59,7 @@ func (s *storage) ListPolicyBindings(ctx apirequest.Context, options *metaintern
 }
 
 func (s *storage) CreatePolicyBinding(ctx apirequest.Context, policyBinding *authorizationapi.PolicyBinding) error {
-	_, err := s.Create(ctx, policyBinding)
+	_, err := s.Create(ctx, policyBinding, false)
 	return err
 }
 

pkg/authorization/registry/policybinding/strategy.go

@@ -83,12 +83,12 @@ func (strategy) ValidateUpdate(ctx apirequest.Context, obj, old runtime.Object)
 }
 
 // GetAttrs returns labels and fields of a given object for filtering purposes
-func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, error) {
+func GetAttrs(obj runtime.Object) (labels.Set, fields.Set, bool, error) {
 	policyBinding, ok := obj.(*authorizationapi.PolicyBinding)
 	if !ok {
-		return nil, nil, fmt.Errorf("not a PolicyBinding")
+		return nil, nil, false, fmt.Errorf("not a PolicyBinding")
 	}
-	return labels.Set(policyBinding.ObjectMeta.Labels), authorizationapi.PolicyBindingToSelectableFields(policyBinding), nil
+	return labels.Set(policyBinding.ObjectMeta.Labels), authorizationapi.PolicyBindingToSelectableFields(policyBinding), policyBinding.Initializers != nil, nil
 }
 
 // Matcher returns a generic matcher for a given label and field selector.