scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 11:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37532 from smarterclayton/remove_export

Browse Source 
Automatic merge from submit-queue

Remove ExportOptions from api/internal and use unversioned

Should only have one internal object in use

Part of #37530
This commit is contained in:
Kubernetes Submit Queue
2016-12-02 21:11:56 -08:00
committed by GitHub
parent 6b05a519a3 0b1a806181
commit efa42b95a6
73 changed files with 22067 additions and 23059 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/apis/storage/register.go
View File

@@ -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{},

3
pkg/apis/storage/v1beta1/register.go
View File

@@ -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{},