mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 04:06:03 +00:00
Merge pull request #89183 from andrewsykim/e2e-framework-storage-class
e2e/framework: remove direct import to pkg/apis/v1/storage/util
This commit is contained in:
commit
9bee0747a9
@ -6,7 +6,6 @@ go_library(
|
|||||||
importpath = "k8s.io/kubernetes/test/e2e/framework/pv",
|
importpath = "k8s.io/kubernetes/test/e2e/framework/pv",
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
deps = [
|
deps = [
|
||||||
"//pkg/apis/storage/v1/util:go_default_library",
|
|
||||||
"//pkg/volume/util:go_default_library",
|
"//pkg/volume/util:go_default_library",
|
||||||
"//staging/src/k8s.io/api/core/v1:go_default_library",
|
"//staging/src/k8s.io/api/core/v1:go_default_library",
|
||||||
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
|
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
|
||||||
|
@ -29,7 +29,6 @@ import (
|
|||||||
"k8s.io/apimachinery/pkg/labels"
|
"k8s.io/apimachinery/pkg/labels"
|
||||||
"k8s.io/apimachinery/pkg/types"
|
"k8s.io/apimachinery/pkg/types"
|
||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
|
|
||||||
"k8s.io/kubernetes/pkg/volume/util"
|
"k8s.io/kubernetes/pkg/volume/util"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
|
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
|
||||||
@ -53,6 +52,14 @@ const (
|
|||||||
|
|
||||||
// VolumeSelectorKey is the key for volume selector.
|
// VolumeSelectorKey is the key for volume selector.
|
||||||
VolumeSelectorKey = "e2e-pv-pool"
|
VolumeSelectorKey = "e2e-pv-pool"
|
||||||
|
|
||||||
|
// isDefaultStorageClassAnnotation represents a StorageClass annotation that
|
||||||
|
// marks a class as the default StorageClass
|
||||||
|
isDefaultStorageClassAnnotation = "storageclass.kubernetes.io/is-default-class"
|
||||||
|
|
||||||
|
// betaIsDefaultStorageClassAnnotation is the beta version of IsDefaultStorageClassAnnotation.
|
||||||
|
// TODO: remove Beta when no longer used
|
||||||
|
betaIsDefaultStorageClassAnnotation = "storageclass.beta.kubernetes.io/is-default-class"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
@ -779,7 +786,7 @@ func GetDefaultStorageClassName(c clientset.Interface) (string, error) {
|
|||||||
}
|
}
|
||||||
var scName string
|
var scName string
|
||||||
for _, sc := range list.Items {
|
for _, sc := range list.Items {
|
||||||
if storageutil.IsDefaultAnnotation(sc.ObjectMeta) {
|
if isDefaultAnnotation(sc.ObjectMeta) {
|
||||||
if len(scName) != 0 {
|
if len(scName) != 0 {
|
||||||
return "", fmt.Errorf("Multiple default storage classes found: %q and %q", scName, sc.Name)
|
return "", fmt.Errorf("Multiple default storage classes found: %q and %q", scName, sc.Name)
|
||||||
}
|
}
|
||||||
@ -793,6 +800,20 @@ func GetDefaultStorageClassName(c clientset.Interface) (string, error) {
|
|||||||
return scName, nil
|
return scName, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// isDefaultAnnotation returns a boolean if the default storage class
|
||||||
|
// annotation is set
|
||||||
|
// TODO: remove Beta when no longer needed
|
||||||
|
func isDefaultAnnotation(obj metav1.ObjectMeta) bool {
|
||||||
|
if obj.Annotations[isDefaultStorageClassAnnotation] == "true" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if obj.Annotations[betaIsDefaultStorageClassAnnotation] == "true" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
// SkipIfNoDefaultStorageClass skips tests if no default SC can be found.
|
// SkipIfNoDefaultStorageClass skips tests if no default SC can be found.
|
||||||
func SkipIfNoDefaultStorageClass(c clientset.Interface) {
|
func SkipIfNoDefaultStorageClass(c clientset.Interface) {
|
||||||
_, err := GetDefaultStorageClassName(c)
|
_, err := GetDefaultStorageClassName(c)
|
||||||
|
Loading…
Reference in New Issue
Block a user