diff --git a/api/swagger-spec/resourceListing.json b/api/swagger-spec/resourceListing.json index 3bdebc17147..ea421536924 100644 --- a/api/swagger-spec/resourceListing.json +++ b/api/swagger-spec/resourceListing.json @@ -113,14 +113,14 @@ "path": "/apis/settings.k8s.io", "description": "get information of a group" }, - { - "path": "/apis/storage.k8s.io/v1beta1", - "description": "API at /apis/storage.k8s.io/v1beta1" - }, { "path": "/apis/storage.k8s.io/v1", "description": "API at /apis/storage.k8s.io/v1" }, + { + "path": "/apis/storage.k8s.io/v1beta1", + "description": "API at /apis/storage.k8s.io/v1beta1" + }, { "path": "/apis/storage.k8s.io", "description": "get information of a group" diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/install/install.go b/staging/src/k8s.io/client-go/pkg/apis/storage/install/install.go index fb590fecd69..4608a54ea70 100644 --- a/staging/src/k8s.io/client-go/pkg/apis/storage/install/install.go +++ b/staging/src/k8s.io/client-go/pkg/apis/storage/install/install.go @@ -37,9 +37,8 @@ func init() { func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *registered.APIRegistrationManager, scheme *runtime.Scheme) { if err := announced.NewGroupMetaFactory( &announced.GroupMetaFactoryArgs{ - GroupName: storage.GroupName, - // TODO: change the order when GKE supports v1 - VersionPreferenceOrder: []string{v1beta1.SchemeGroupVersion.Version, v1.SchemeGroupVersion.Version}, + GroupName: storage.GroupName, + VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version, v1beta1.SchemeGroupVersion.Version}, ImportPrefix: "k8s.io/client-go/pkg/apis/storage", RootScopedKinds: sets.NewString("StorageClass"), AddInternalObjectsToScheme: storage.AddToScheme,