Remove references to v1/internal ExportOptions

2016-11-27 19:04:05 -05:00 · 2016-11-27 19:04:05 -05:00 · 3dde81f8d0
parent c43bdfbf0d
commit 3dde81f8d0
27 changed files with 49 additions and 34 deletions
--- a/cmd/kubeadm/app/apis/kubeadm/register.go
+++ b/cmd/kubeadm/app/apis/kubeadm/register.go
@ -18,6 +18,7 @@ package kubeadm

 import (
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
 )
@ -50,7 +51,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&ClusterInfo{},
 		&api.ListOptions{},
 		&api.DeleteOptions{},
-		&api.ExportOptions{},
+		&unversioned.ExportOptions{},
 	)
 	return nil
 }
--- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go
+++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -50,7 +51,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&ClusterInfo{},
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},
 	)
 	return nil
 }
--- a/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go
+++ b/cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/register.go
@ -42,7 +42,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
 		&unversioned.Status{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},
 	)
 	versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
--- a/federation/apis/core/v1/conversion.go
+++ b/federation/apis/core/v1/conversion.go
@ -28,8 +28,6 @@ func addConversionFuncs(scheme *runtime.Scheme) error {
 	err := scheme.AddConversionFuncs(
 		v1.Convert_v1_DeleteOptions_To_api_DeleteOptions,
 		v1.Convert_api_DeleteOptions_To_v1_DeleteOptions,
-		v1.Convert_v1_ExportOptions_To_api_ExportOptions,
-		v1.Convert_api_ExportOptions_To_v1_ExportOptions,
 		v1.Convert_v1_List_To_api_List,
 		v1.Convert_api_List_To_v1_List,
 		v1.Convert_v1_ListOptions_To_api_ListOptions,
--- a/federation/apis/federation/v1beta1/register.go
+++ b/federation/apis/federation/v1beta1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -40,7 +41,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&ClusterList{},
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},
 	)
 	versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
--- a/pkg/api/install/install_test.go
+++ b/pkg/api/install/install_test.go
@ -121,7 +121,6 @@ func TestRESTMapper(t *testing.T) {
 func TestUnversioned(t *testing.T) {
 	for _, obj := range []runtime.Object{
 		&unversioned.Status{},
-		&unversioned.ExportOptions{},
 	} {
 		if unversioned, ok := internal.Scheme.IsUnversioned(obj); !unversioned || !ok {
 			t.Errorf("%v is expected to be unversioned", reflect.TypeOf(obj))
--- a/pkg/api/register.go
+++ b/pkg/api/register.go
@ -129,7 +129,6 @@ func addKnownTypes(scheme *runtime.Scheme) error {

 	// Register Unversioned types under their own special group
 	scheme.AddUnversionedTypes(Unversioned,
-		&unversioned.ExportOptions{},
 		&unversioned.Status{},
 		&unversioned.APIVersions{},
 		&unversioned.APIGroupList{},
--- a/pkg/api/v1/register.go
+++ b/pkg/api/v1/register.go
@ -71,7 +71,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&PersistentVolumeClaim{},
 		&PersistentVolumeClaimList{},
 		&DeleteOptions{},
-		&ExportOptions{},
+		&unversioned.ExportOptions{},
 		&ListOptions{},
 		&PodAttachOptions{},
 		&PodLogOptions{},
--- a/pkg/apis/apps/v1beta1/register.go
+++ b/pkg/apis/apps/v1beta1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -41,7 +42,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&StatefulSetList{},
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},
 	)
 	versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
--- a/pkg/apis/authentication/register.go
+++ b/pkg/apis/authentication/register.go
@ -18,6 +18,7 @@ package authentication

 import (
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
 )
@ -47,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&api.ListOptions{},
 		&api.DeleteOptions{},
-		&api.ExportOptions{},
+		&unversioned.ExportOptions{},

 		&TokenReview{},
 	)
--- a/pkg/apis/authentication/v1beta1/register.go
+++ b/pkg/apis/authentication/v1beta1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -38,7 +39,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},

 		&TokenReview{},
 	)
--- a/pkg/apis/authorization/v1beta1/register.go
+++ b/pkg/apis/authorization/v1beta1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -39,7 +40,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},

 		&SelfSubjectAccessReview{},
 		&SubjectAccessReview{},
--- a/pkg/apis/autoscaling/v1/register.go
+++ b/pkg/apis/autoscaling/v1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -42,7 +43,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&Scale{},
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},
 	)
 	versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
--- a/pkg/apis/batch/v1/register.go
+++ b/pkg/apis/batch/v1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -41,7 +42,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&JobList{},
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},
 	)
 	versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
--- a/pkg/apis/certificates/v1alpha1/register.go
+++ b/pkg/apis/certificates/v1alpha1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -51,7 +52,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&CertificateSigningRequestList{},
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},
 	)

 	// Add the watch version that applies
--- a/pkg/apis/extensions/register.go
+++ b/pkg/apis/extensions/register.go
@ -18,6 +18,7 @@ package extensions

 import (
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
 	"k8s.io/kubernetes/pkg/apis/batch"
 	"k8s.io/kubernetes/pkg/runtime"
@ -71,7 +72,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&api.DeleteOptions{},
 		&ReplicaSet{},
 		&ReplicaSetList{},
-		&api.ExportOptions{},
+		&unversioned.ExportOptions{},
 		&PodSecurityPolicy{},
 		&PodSecurityPolicyList{},
 		&NetworkPolicy{},
--- a/pkg/apis/extensions/v1beta1/register.go
+++ b/pkg/apis/extensions/v1beta1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -56,7 +57,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&IngressList{},
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},
 		&ReplicaSet{},
 		&ReplicaSetList{},
 		&PodSecurityPolicy{},
--- a/pkg/apis/imagepolicy/register.go
+++ b/pkg/apis/imagepolicy/register.go
@ -18,6 +18,7 @@ package imagepolicy

 import (
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
 )
@ -47,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&api.ListOptions{},
 		&api.DeleteOptions{},
-		&api.ExportOptions{},
+		&unversioned.ExportOptions{},

 		&ImageReview{},
 	)
--- a/pkg/apis/imagepolicy/v1alpha1/register.go
+++ b/pkg/apis/imagepolicy/v1alpha1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -38,7 +39,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},

 		&ImageReview{},
 	)
--- a/pkg/apis/policy/v1alpha1/register.go
+++ b/pkg/apis/policy/v1alpha1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -42,7 +43,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&Eviction{},
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},
 	)
 	// Add the watch version that applies
 	versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
--- a/pkg/apis/policy/v1beta1/register.go
+++ b/pkg/apis/policy/v1beta1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -42,7 +43,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&Eviction{},
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},
 	)
 	// Add the watch version that applies
 	versionedwatch.AddToGroupVersion(scheme, SchemeGroupVersion)
--- a/pkg/apis/rbac/register.go
+++ b/pkg/apis/rbac/register.go
@ -18,6 +18,7 @@ package rbac

 import (
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
 	"k8s.io/kubernetes/pkg/watch/versioned"
@ -58,7 +59,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {

 		&api.ListOptions{},
 		&api.DeleteOptions{},
-		&api.ExportOptions{},
+		&unversioned.ExportOptions{},
 	)
 	versioned.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
--- a/pkg/apis/rbac/v1alpha1/register.go
+++ b/pkg/apis/rbac/v1alpha1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -48,7 +49,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {

 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},
 	)
 	versioned.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil
--- a/pkg/apis/storage/register.go
+++ b/pkg/apis/storage/register.go
@ -18,6 +18,7 @@ package storage

 import (
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
 )
@ -47,7 +48,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&api.ListOptions{},
 		&api.DeleteOptions{},
-		&api.ExportOptions{},
+		&unversioned.ExportOptions{},

 		&StorageClass{},
 		&StorageClassList{},
--- a/pkg/apis/storage/v1beta1/register.go
+++ b/pkg/apis/storage/v1beta1/register.go
@ -17,6 +17,7 @@ limitations under the License.
 package v1beta1

 import (
+	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/runtime"
 	"k8s.io/kubernetes/pkg/runtime/schema"
@ -39,7 +40,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 	scheme.AddKnownTypes(SchemeGroupVersion,
 		&v1.ListOptions{},
 		&v1.DeleteOptions{},
-		&v1.ExportOptions{},
+		&unversioned.ExportOptions{},

 		&StorageClass{},
 		&StorageClassList{},
--- a/pkg/apiserver/apiserver_test.go
+++ b/pkg/apiserver/apiserver_test.go
@ -131,10 +131,10 @@ func addGrouplessTypes() {
 		TimeoutSeconds       *int64 `json:"timeoutSeconds,omitempty"`
 	}
 	api.Scheme.AddKnownTypes(grouplessGroupVersion,
-		&apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{},
+		&apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &unversioned.ExportOptions{},
 		&api.DeleteOptions{}, &apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{})
 	api.Scheme.AddKnownTypes(grouplessInternalGroupVersion,
-		&apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &api.ListOptions{},
+		&apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &api.ListOptions{}, &unversioned.ExportOptions{},
 		&apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{})
 }

@ -149,20 +149,20 @@ func addTestTypes() {
 		TimeoutSeconds       *int64 `json:"timeoutSeconds,omitempty"`
 	}
 	api.Scheme.AddKnownTypes(testGroupVersion,
-		&apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{},
+		&apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &unversioned.ExportOptions{},
 		&api.DeleteOptions{}, &apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{},
 		&SimpleXGSubresource{})
 	api.Scheme.AddKnownTypes(testGroupVersion, &v1.Pod{})
 	api.Scheme.AddKnownTypes(testInternalGroupVersion,
-		&apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &api.ListOptions{},
+		&apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &api.ListOptions{}, &unversioned.ExportOptions{},
 		&apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{},
 		&SimpleXGSubresource{})
 	api.Scheme.AddKnownTypes(testInternalGroupVersion, &api.Pod{})
 	// Register SimpleXGSubresource in both testGroupVersion and testGroup2Version, and also their
 	// their corresponding internal versions, to verify that the desired group version object is
 	// served in the tests.
-	api.Scheme.AddKnownTypes(testGroup2Version, &SimpleXGSubresource{})
-	api.Scheme.AddKnownTypes(testInternalGroup2Version, &SimpleXGSubresource{})
+	api.Scheme.AddKnownTypes(testGroup2Version, &SimpleXGSubresource{}, &unversioned.ExportOptions{})
+	api.Scheme.AddKnownTypes(testInternalGroup2Version, &SimpleXGSubresource{}, &unversioned.ExportOptions{})
 	versioned.AddToGroupVersion(api.Scheme, testGroupVersion)
 }

@ -177,7 +177,7 @@ func addNewTestTypes() {
 		TimeoutSeconds       *int64 `json:"timeoutSeconds,omitempty"`
 	}
 	api.Scheme.AddKnownTypes(newGroupVersion,
-		&apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{},
+		&apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &unversioned.ExportOptions{},
 		&api.DeleteOptions{}, &apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{},
 		&v1.Pod{},
 	)
--- a/pkg/apiserver/resthandler.go
+++ b/pkg/apiserver/resthandler.go
@ -132,7 +132,6 @@ func GetResource(r rest.Getter, e rest.Exporter, scope RequestScope) restful.Rou

 			// check for export
 			if values := req.Request.URL.Query(); len(values) > 0 {
-				// TODO: this is internal version, not unversioned
 				exports := unversioned.ExportOptions{}
 				if err := scope.ParameterCodec.DecodeParameters(values, schema.GroupVersion{Version: "v1"}, &exports); err != nil {
 					return nil, err