boring changes

cmd/gitserver/gitserver.go

@@ -14,7 +14,7 @@ import (
 
 	// install all APIs
 	_ "github.com/openshift/origin/pkg/api/install"
-	_ "k8s.io/kubernetes/pkg/api/install"
+	_ "k8s.io/kubernetes/pkg/apis/core/install"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 )
 

cmd/oc/oc.go

@@ -14,9 +14,9 @@ import (
 
 	// install all APIs
 	_ "github.com/openshift/origin/pkg/api/install"
-	_ "k8s.io/kubernetes/pkg/api/install"
 	_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
 	_ "k8s.io/kubernetes/pkg/apis/batch/install"
+	_ "k8s.io/kubernetes/pkg/apis/core/install"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 )
 

cmd/openshift-diagnostics/main.go

@@ -14,9 +14,9 @@ import (
 
 	// install all APIs
 	_ "github.com/openshift/origin/pkg/api/install"
-	_ "k8s.io/kubernetes/pkg/api/install"
 	_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
 	_ "k8s.io/kubernetes/pkg/apis/batch/install"
+	_ "k8s.io/kubernetes/pkg/apis/core/install"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 )
 

cmd/openshift/openshift.go

@@ -14,9 +14,9 @@ import (
 
 	// install all APIs
 	_ "github.com/openshift/origin/pkg/api/install"
-	_ "k8s.io/kubernetes/pkg/api/install"
 	_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
 	_ "k8s.io/kubernetes/pkg/apis/batch/install"
+	_ "k8s.io/kubernetes/pkg/apis/core/install"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 )
 

cmd/template-service-broker/tsb.go

@@ -16,9 +16,9 @@ import (
 
 	// install all APIs
 	_ "github.com/openshift/origin/pkg/api/install"
-	_ "k8s.io/kubernetes/pkg/api/install"
 	_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
 	_ "k8s.io/kubernetes/pkg/apis/batch/install"
+	_ "k8s.io/kubernetes/pkg/apis/core/install"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 )
 

examples/examples_test.go

@@ -13,8 +13,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/yaml"
 	apirequest "k8s.io/apiserver/pkg/endpoints/request"
-	kapi "k8s.io/kubernetes/pkg/api"
-	kvalidation "k8s.io/kubernetes/pkg/api/validation"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
+	kvalidation "k8s.io/kubernetes/pkg/apis/core/validation"
 	"k8s.io/kubernetes/pkg/capabilities"
 
 	"github.com/openshift/origin/pkg/api/validation"
@@ -28,7 +29,7 @@ import (
 
 	// install all APIs
 	_ "github.com/openshift/origin/pkg/api/install"
-	_ "k8s.io/kubernetes/pkg/api/install"
+	_ "k8s.io/kubernetes/pkg/apis/core/install"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 )
 
@@ -153,7 +154,7 @@ func TestExampleObjectSchemas(t *testing.T) {
 				t.Logf("%q is skipped", path)
 				return
 			}
-			if err := runtime.DecodeInto(kapi.Codecs.UniversalDecoder(), data, expectedType); err != nil {
+			if err := runtime.DecodeInto(legacyscheme.Codecs.UniversalDecoder(), data, expectedType); err != nil {
 				t.Errorf("%s did not decode correctly: %v\n%s", path, err, string(data))
 				return
 			}
@@ -203,7 +204,7 @@ func validateObject(path string, obj runtime.Object, t *testing.T) {
 
 	case *kapi.List, *imageapi.ImageStreamList:
 		if list, err := meta.ExtractList(typedObj); err == nil {
-			runtime.DecodeList(list, kapi.Codecs.UniversalDecoder())
+			runtime.DecodeList(list, legacyscheme.Codecs.UniversalDecoder())
 			for i := range list {
 				validateObject(path, list[i], t)
 			}

pkg/api/compatibility_test.go

@@ -12,8 +12,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/validation/field"
-	"k8s.io/kubernetes/pkg/api"
-	"k8s.io/kubernetes/pkg/api/validation"
+	api "k8s.io/kubernetes/pkg/apis/core"
+	"k8s.io/kubernetes/pkg/apis/core/validation"
 )
 
 func TestCompatibility_v1_Pod(t *testing.T) {

pkg/api/graph/graphview/veneering_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/gonum/graph/concrete"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	kapi "k8s.io/kubernetes/pkg/api"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 	osgraphtest "github.com/openshift/origin/pkg/api/graph/test"

pkg/api/graph/test/runtimeobject_nodebuilder.go

@@ -7,8 +7,9 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
-	kapi "k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
 
 	osgraph "github.com/openshift/origin/pkg/api/graph"
@@ -129,13 +130,13 @@ func BuildGraph(path string) (osgraph.Graph, []runtime.Object, error) {
 		return g, objs, err
 	}
 
-	mapper := kapi.Registry.RESTMapper()
-	typer := kapi.Scheme
+	mapper := legacyscheme.Registry.RESTMapper()
+	typer := legacyscheme.Scheme
 	clientMapper := resource.ClientMapperFunc(func(mapping *meta.RESTMapping) (resource.RESTClient, error) {
 		return nil, nil
 	})
 
-	r := resource.NewBuilder(mapper, resource.SimpleCategoryExpander{}, typer, clientMapper, kapi.Codecs.UniversalDecoder()).
+	r := resource.NewBuilder(mapper, resource.SimpleCategoryExpander{}, typer, clientMapper, legacyscheme.Codecs.UniversalDecoder()).
 		FilenameParam(false, &resource.FilenameOptions{Recursive: false, Filenames: []string{abspath}}).
 		Flatten().
 		Do()

pkg/api/install/install.go

@@ -3,17 +3,18 @@ package install
 import (
 	kv1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/conversion"
-	kapi "k8s.io/kubernetes/pkg/api"
-	kapiv1 "k8s.io/kubernetes/pkg/api/v1"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
+	kapiv1 "k8s.io/kubernetes/pkg/apis/core/v1"
 
 	// we have a strong dependency on kube objects for deployments and scale
-	_ "k8s.io/kubernetes/pkg/api/install"
 	_ "k8s.io/kubernetes/pkg/apis/apps/install"
 	_ "k8s.io/kubernetes/pkg/apis/authentication/install"
 	_ "k8s.io/kubernetes/pkg/apis/authorization/install"
 	_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
 	_ "k8s.io/kubernetes/pkg/apis/batch/install"
 	_ "k8s.io/kubernetes/pkg/apis/certificates/install"
+	_ "k8s.io/kubernetes/pkg/apis/core/install"
 	_ "k8s.io/kubernetes/pkg/apis/extensions/install"
 	_ "k8s.io/kubernetes/pkg/apis/policy/install"
 	_ "k8s.io/kubernetes/pkg/apis/rbac/install"
@@ -73,7 +74,7 @@ func init() {
 	// This is a "fast-path" that avoids reflection for common types. It focuses on the objects that are
 	// converted the most in the cluster.
 	// TODO: generate one of these for every external API group - this is to prove the impact
-	kapi.Scheme.AddGenericConversionFunc(func(objA, objB interface{}, s conversion.Scope) (bool, error) {
+	legacyscheme.Scheme.AddGenericConversionFunc(func(objA, objB interface{}, s conversion.Scope) (bool, error) {
 		switch a := objA.(type) {
 		case *metav1.WatchEvent:
 			switch b := objB.(type) {
@@ -107,34 +108,34 @@ func init() {
 		case *kv1.ServiceAccount:
 			switch b := objB.(type) {
 			case *kapi.ServiceAccount:
-				return true, kapiv1.Convert_v1_ServiceAccount_To_api_ServiceAccount(a, b, s)
+				return true, kapiv1.Convert_v1_ServiceAccount_To_core_ServiceAccount(a, b, s)
 			}
 		case *kapi.ServiceAccount:
 			switch b := objB.(type) {
 			case *kv1.ServiceAccount:
-				return true, kapiv1.Convert_api_ServiceAccount_To_v1_ServiceAccount(a, b, s)
+				return true, kapiv1.Convert_core_ServiceAccount_To_v1_ServiceAccount(a, b, s)
 			}
 
 		case *kv1.SecretList:
 			switch b := objB.(type) {
 			case *kapi.SecretList:
-				return true, kapiv1.Convert_v1_SecretList_To_api_SecretList(a, b, s)
+				return true, kapiv1.Convert_v1_SecretList_To_core_SecretList(a, b, s)
 			}
 		case *kapi.SecretList:
 			switch b := objB.(type) {
 			case *kv1.SecretList:
-				return true, kapiv1.Convert_api_SecretList_To_v1_SecretList(a, b, s)
+				return true, kapiv1.Convert_core_SecretList_To_v1_SecretList(a, b, s)
 			}
 
 		case *kv1.Secret:
 			switch b := objB.(type) {
 			case *kapi.Secret:
-				return true, kapiv1.Convert_v1_Secret_To_api_Secret(a, b, s)
+				return true, kapiv1.Convert_v1_Secret_To_core_Secret(a, b, s)
 			}
 		case *kapi.Secret:
 			switch b := objB.(type) {
 			case *kv1.Secret:
-				return true, kapiv1.Convert_api_Secret_To_v1_Secret(a, b, s)
+				return true, kapiv1.Convert_core_Secret_To_v1_Secret(a, b, s)
 			}
 
 		case *routev1.RouteList:

pkg/api/install/tags_test.go

@@ -10,17 +10,17 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
-	kapi "k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	configapi "github.com/openshift/origin/pkg/cmd/server/api"
 	configapiv1 "github.com/openshift/origin/pkg/cmd/server/api/v1"
 )
 
 func TestDescriptions(t *testing.T) {
-	for _, version := range kapi.Registry.RegisteredGroupVersions() {
+	for _, version := range legacyscheme.Registry.RegisteredGroupVersions() {
 		seen := map[reflect.Type]bool{}
 
-		for _, apiType := range kapi.Scheme.KnownTypes(version) {
+		for _, apiType := range legacyscheme.Scheme.KnownTypes(version) {
 			checkDescriptions(apiType, &seen, t)
 		}
 	}
@@ -63,14 +63,14 @@ func TestInternalJsonTags(t *testing.T) {
 	seen := map[reflect.Type]bool{}
 	seenGroups := sets.String{}
 
-	for _, version := range kapi.Registry.RegisteredGroupVersions() {
+	for _, version := range legacyscheme.Registry.RegisteredGroupVersions() {
 		if seenGroups.Has(version.Group) {
 			continue
 		}
 		seenGroups.Insert(version.Group)
 
 		internalVersion := schema.GroupVersion{Group: version.Group, Version: runtime.APIVersionInternal}
-		for _, apiType := range kapi.Scheme.KnownTypes(internalVersion) {
+		for _, apiType := range legacyscheme.Scheme.KnownTypes(internalVersion) {
 			checkInternalJsonTags(apiType, &seen, t)
 		}
 	}
@@ -122,8 +122,8 @@ func checkInternalJsonTags(objType reflect.Type, seen *map[reflect.Type]bool, t
 func TestExternalJsonTags(t *testing.T) {
 	seen := map[reflect.Type]bool{}
 
-	for _, version := range kapi.Registry.RegisteredGroupVersions() {
-		for _, apiType := range kapi.Scheme.KnownTypes(version) {
+	for _, version := range legacyscheme.Registry.RegisteredGroupVersions() {
+		for _, apiType := range legacyscheme.Scheme.KnownTypes(version) {
 			checkExternalJsonTags(apiType, &seen, t)
 		}
 	}

pkg/api/kubegraph/analysis/hpa.go

@@ -5,8 +5,8 @@ import (
 	"strings"
 
 	"k8s.io/apimachinery/pkg/util/sets"
-	kapi "k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	graphapi "github.com/gonum/graph"
 	"github.com/gonum/graph/path"

pkg/api/kubegraph/analysis/pod.go

@@ -7,7 +7,7 @@ import (
 	"github.com/MakeNowJust/heredoc"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	kapi "k8s.io/kubernetes/pkg/api"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 	kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"

pkg/api/kubegraph/edge_test.go

@@ -9,10 +9,10 @@ import (
 	"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"
-	_ "k8s.io/kubernetes/pkg/api/install"
 	kapps "k8s.io/kubernetes/pkg/apis/apps"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
+	_ "k8s.io/kubernetes/pkg/apis/core/install"
 
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 	kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"

pkg/api/kubegraph/edges.go

@@ -4,13 +4,14 @@ import (
 	"strings"
 
 	"github.com/gonum/graph"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	kapi "k8s.io/kubernetes/pkg/api"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 	kubegraph "github.com/openshift/origin/pkg/api/kubegraph/nodes"
@@ -229,7 +230,7 @@ func AddHPAScaleRefEdges(g osgraph.Graph) {
 			groupVersionResource = schema.GroupVersionResource{Resource: resource}
 		}
 
-		groupVersionResource, err := kapi.Registry.RESTMapper().ResourceFor(groupVersionResource)
+		groupVersionResource, err := legacyscheme.Registry.RESTMapper().ResourceFor(groupVersionResource)
 		if err != nil {
 			continue
 		}

pkg/api/kubegraph/nodes/nodes.go

@@ -3,9 +3,9 @@ package nodes
 import (
 	"github.com/gonum/graph"
 
-	kapi "k8s.io/kubernetes/pkg/api"
 	kapps "k8s.io/kubernetes/pkg/apis/apps"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 )

pkg/api/kubegraph/nodes/nodes_test.go

@@ -3,7 +3,7 @@ package nodes
 import (
 	"testing"
 
-	kapi "k8s.io/kubernetes/pkg/api"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 )

pkg/api/kubegraph/nodes/types.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"reflect"
 
-	kapi "k8s.io/kubernetes/pkg/api"
 	kapps "k8s.io/kubernetes/pkg/apis/apps"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
+	kapi "k8s.io/kubernetes/pkg/apis/core"
 
 	osgraph "github.com/openshift/origin/pkg/api/graph"
 )

pkg/api/latest/latest.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/legacyscheme"
 )
 
 // HACK TO ELIMINATE CYCLES UNTIL WE KILL THIS PACKAGE
@@ -72,7 +72,7 @@ func getOrCreateOriginKinds() map[schema.GroupVersionKind]bool {
 
 			// enumerate all supported versions, get the kinds, and register with the mapper how to address our resources
 			for _, version := range Versions {
-				for kind, t := range api.Scheme.KnownTypes(version) {
+				for kind, t := range legacyscheme.Scheme.KnownTypes(version) {
 					// these don't require special handling at the RESTMapping level since they are either "normal" when groupified
 					// or under /api (not /oapi)
 					if kind == "SecurityContextConstraints" {