add import-alias for k8s.io/api/storage/v1beta1

This commit is contained in:
Aaron Crickenberger 2019-06-20 11:41:02 -07:00
parent b6fbfbbb57
commit efe97e4b0a
2 changed files with 5 additions and 4 deletions

View File

@ -32,5 +32,6 @@
"k8s.io/api/scheduling/v1beta1": "schedulingv1beta1", "k8s.io/api/scheduling/v1beta1": "schedulingv1beta1",
"k8s.io/api/settings/v1alpha1": "settingsv1alpha1", "k8s.io/api/settings/v1alpha1": "settingsv1alpha1",
"k8s.io/api/storage/v1": "storagev1", "k8s.io/api/storage/v1": "storagev1",
"k8s.io/api/storage/v1alpha1": "storagev1alpha1" "k8s.io/api/storage/v1alpha1": "storagev1alpha1",
"k8s.io/api/storage/v1beta1": "storagev1beta1"
} }

View File

@ -31,7 +31,7 @@ import (
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1" rbacv1 "k8s.io/api/rbac/v1"
storagev1 "k8s.io/api/storage/v1" storagev1 "k8s.io/api/storage/v1"
storagebeta "k8s.io/api/storage/v1beta1" storagev1beta1 "k8s.io/api/storage/v1beta1"
apierrs "k8s.io/apimachinery/pkg/api/errors" apierrs "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -1116,7 +1116,7 @@ func getStorageClass(
} }
// TODO: remove when storage.k8s.io/v1beta1 is removed. // TODO: remove when storage.k8s.io/v1beta1 is removed.
func newBetaStorageClass(t testsuites.StorageClassTest, suffix string) *storagebeta.StorageClass { func newBetaStorageClass(t testsuites.StorageClassTest, suffix string) *storagev1beta1.StorageClass {
pluginName := t.Provisioner pluginName := t.Provisioner
if pluginName == "" { if pluginName == "" {
@ -1126,7 +1126,7 @@ func newBetaStorageClass(t testsuites.StorageClassTest, suffix string) *storageb
suffix = "default" suffix = "default"
} }
return &storagebeta.StorageClass{ return &storagev1beta1.StorageClass{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
Kind: "StorageClass", Kind: "StorageClass",
}, },