From 006dc7477f15e42ae70adc02421a5bacd068ba05 Mon Sep 17 00:00:00 2001 From: wojtekt Date: Wed, 3 Mar 2021 15:17:28 +0100 Subject: [PATCH] Make sig-storage be the owner of ubernetes_lite_volumes test --- .../ubernetes_lite_volumes.go | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) rename test/e2e/{scheduling => storage}/ubernetes_lite_volumes.go (95%) diff --git a/test/e2e/scheduling/ubernetes_lite_volumes.go b/test/e2e/storage/ubernetes_lite_volumes.go similarity index 95% rename from test/e2e/scheduling/ubernetes_lite_volumes.go rename to test/e2e/storage/ubernetes_lite_volumes.go index 014cde43b35..9cc20d7aa4b 100644 --- a/test/e2e/scheduling/ubernetes_lite_volumes.go +++ b/test/e2e/storage/ubernetes_lite_volumes.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package scheduling +package storage import ( "context" @@ -28,15 +28,17 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/uuid" + clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/test/e2e/framework" e2enode "k8s.io/kubernetes/test/e2e/framework/node" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" "k8s.io/kubernetes/test/e2e/framework/providers/gce" e2epv "k8s.io/kubernetes/test/e2e/framework/pv" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" + "k8s.io/kubernetes/test/e2e/storage/utils" ) -var _ = SIGDescribe("Multi-AZ Cluster Volumes [sig-storage]", func() { +var _ = utils.SIGDescribe("Multi-AZ Cluster Volumes", func() { f := framework.NewDefaultFramework("multi-az") var zoneCount int var err error @@ -179,6 +181,15 @@ func OnlyAllowNodeZones(f *framework.Framework, zoneCount int, image string) { framework.ExpectEqual(pvZones.Equal(expectedZones), true, fmt.Sprintf("PDs provisioned in unwanted zones. We want zones: %v, got: %v", expectedZones, pvZones)) } +// Return the number of zones in which we have nodes in this cluster. +func getZoneCount(c clientset.Interface) (int, error) { + zoneNames, err := e2enode.GetClusterZones(c) + if err != nil { + return -1, err + } + return len(zoneNames), nil +} + type staticPVTestConfig struct { pvSource *v1.PersistentVolumeSource pv *v1.PersistentVolume