From bfc0d453039be59d43aeeeaef71050a912dfea68 Mon Sep 17 00:00:00 2001 From: Aniket Kulkarni Date: Fri, 24 Aug 2018 16:08:25 -0400 Subject: [PATCH] e2e tests for flex volume expand mysterious build error --- test/e2e/storage/BUILD | 1 + test/e2e/storage/flexvolume_resize.go | 178 ++++++++++++++++++ .../flexvolume/dummy-attachable | 20 +- 3 files changed, 198 insertions(+), 1 deletion(-) create mode 100644 test/e2e/storage/flexvolume_resize.go diff --git a/test/e2e/storage/BUILD b/test/e2e/storage/BUILD index 207c155e909..75db4ec8176 100644 --- a/test/e2e/storage/BUILD +++ b/test/e2e/storage/BUILD @@ -34,6 +34,7 @@ go_library( "//pkg/apis/core/v1/helper:go_default_library", "//pkg/apis/storage/v1/util:go_default_library", "//pkg/client/conditions:go_default_library", + "//pkg/features:go_default_library", "//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/metrics:go_default_library", "//pkg/util/slice:go_default_library", diff --git a/test/e2e/storage/flexvolume_resize.go b/test/e2e/storage/flexvolume_resize.go new file mode 100644 index 00000000000..d1611d00890 --- /dev/null +++ b/test/e2e/storage/flexvolume_resize.go @@ -0,0 +1,178 @@ +/* +Copyright 2018 The Kubernetes Authors. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package storage + +import ( + "fmt" + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" + "k8s.io/api/core/v1" + storage "k8s.io/api/storage/v1" + "k8s.io/apimachinery/pkg/api/resource" + utilerrors "k8s.io/apimachinery/pkg/util/errors" + clientset "k8s.io/client-go/kubernetes" + "k8s.io/kubernetes/pkg/features" + "k8s.io/kubernetes/test/e2e/framework" + "k8s.io/kubernetes/test/e2e/storage/utils" + "path" +) + +func createStorageClass(ns string, c clientset.Interface) (*storage.StorageClass, error) { + bindingMode := storage.VolumeBindingImmediate + stKlass := getStorageClass("flex-expand", map[string]string{}, &bindingMode, ns, "resizing") + allowExpansion := true + stKlass.AllowVolumeExpansion = &allowExpansion + + var err error + stKlass, err = c.StorageV1().StorageClasses().Create(stKlass) + return stKlass, err +} + +var _ = utils.SIGDescribe("Mounted flexvolume volume expand [Slow] [Feature:ExpandInUsePersistentVolumes]", func() { + var ( + c clientset.Interface + ns string + err error + pvc *v1.PersistentVolumeClaim + resizableSc *storage.StorageClass + nodeName string + isNodeLabeled bool + nodeKeyValueLabel map[string]string + nodeLabelValue string + nodeKey string + nodeList *v1.NodeList + ) + + f := framework.NewDefaultFramework("mounted-flexvolume-expand") + BeforeEach(func() { + framework.SkipUnlessProviderIs("aws", "gce", "local") + if enabled, ok := framework.TestContext.FeatureGates["ExpandInUsePersistentVolumes"]; !ok || !enabled { + framework.Skipf("Only supported when %v feature is enabled", features.ExpandInUsePersistentVolumes) + } + c = f.ClientSet + ns = f.Namespace.Name + framework.ExpectNoError(framework.WaitForAllNodesSchedulable(c, framework.TestContext.NodeSchedulableTimeout)) + + nodeList = framework.GetReadySchedulableNodesOrDie(f.ClientSet) + if len(nodeList.Items) == 0 { + framework.Failf("unable to find ready and schedulable Node") + } + nodeName = nodeList.Items[0].Name + + nodeKey = "mounted_flexvolume_expand" + + if !isNodeLabeled { + nodeLabelValue = ns + nodeKeyValueLabel = make(map[string]string) + nodeKeyValueLabel[nodeKey] = nodeLabelValue + framework.AddOrUpdateLabelOnNode(c, nodeName, nodeKey, nodeLabelValue) + isNodeLabeled = true + } + + resizableSc, err = createStorageClass(ns, c) + if err != nil { + fmt.Printf("storage class creation error: %v\n", err) + } + Expect(err).NotTo(HaveOccurred(), "Error creating resizable storage class: %v", err) + Expect(*resizableSc.AllowVolumeExpansion).To(BeTrue()) + + pvc = getClaim("2Gi", ns) + pvc.Spec.StorageClassName = &resizableSc.Name + pvc, err = c.CoreV1().PersistentVolumeClaims(pvc.Namespace).Create(pvc) + Expect(err).NotTo(HaveOccurred(), "Error creating pvc: %v", err) + + }) + + framework.AddCleanupAction(func() { + if len(nodeLabelValue) > 0 { + framework.RemoveLabelOffNode(c, nodeName, nodeKey) + } + }) + + AfterEach(func() { + framework.Logf("AfterEach: Cleaning up resources for mounted volume resize") + + if c != nil { + if errs := framework.PVPVCCleanup(c, ns, nil, pvc); len(errs) > 0 { + framework.Failf("AfterEach: Failed to delete PVC and/or PV. Errors: %v", utilerrors.NewAggregate(errs)) + } + pvc, nodeName, isNodeLabeled, nodeLabelValue = nil, "", false, "" + nodeKeyValueLabel = make(map[string]string) + } + }) + + It("should be resizable when mounted", func() { + driver := "dummy-attachable" + + node := nodeList.Items[0] + By(fmt.Sprintf("installing flexvolume %s on node %s as %s", path.Join(driverDir, driver), node.Name, driver)) + installFlex(c, &node, "k8s", driver, path.Join(driverDir, driver)) + + pv := framework.MakePersistentVolume(framework.PersistentVolumeConfig{ + PVSource: v1.PersistentVolumeSource{ + FlexVolume: &v1.FlexPersistentVolumeSource{ + Driver: "k8s/" + driver, + }}, + NamePrefix: "pv-", + StorageClassName: resizableSc.Name, + VolumeMode: pvc.Spec.VolumeMode, + }) + + pv, err = framework.CreatePV(c, pv) + Expect(err).NotTo(HaveOccurred(), "Error creating pv %v", err) + + By("Waiting for PVC to be in bound phase") + pvcClaims := []*v1.PersistentVolumeClaim{pvc} + var pvs []*v1.PersistentVolume + + pvs, err = framework.WaitForPVClaimBoundPhase(c, pvcClaims, framework.ClaimProvisionTimeout) + Expect(err).NotTo(HaveOccurred(), "Failed waiting for PVC to be bound %v", err) + Expect(len(pvs)).To(Equal(1)) + + var pod *v1.Pod + By("Creating pod") + pod, err = framework.CreateNginxPod(c, ns, nodeKeyValueLabel, pvcClaims) + Expect(err).NotTo(HaveOccurred(), "Failed to create pod %v", err) + defer framework.DeletePodWithWait(f, c, pod) + + By("Waiting for pod to go to 'running' state") + err = f.WaitForPodRunning(pod.ObjectMeta.Name) + Expect(err).NotTo(HaveOccurred(), "Pod didn't go to 'running' state %v", err) + + By("Expanding current pvc") + newSize := resource.MustParse("6Gi") + pvc, err = expandPVCSize(pvc, newSize, c) + Expect(err).NotTo(HaveOccurred(), "While updating pvc for more size") + Expect(pvc).NotTo(BeNil()) + + pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage] + if pvcSize.Cmp(newSize) != 0 { + framework.Failf("error updating pvc size %q", pvc.Name) + } + + By("Waiting for cloudprovider resize to finish") + err = waitForControllerVolumeResize(pvc, c) + Expect(err).NotTo(HaveOccurred(), "While waiting for pvc resize to finish") + + By("Waiting for file system resize to finish") + pvc, err = waitForFSResize(pvc, c) + Expect(err).NotTo(HaveOccurred(), "while waiting for fs resize to finish") + + pvcConditions := pvc.Status.Conditions + Expect(len(pvcConditions)).To(Equal(0), "pvc should not have conditions") + }) +}) diff --git a/test/e2e/testing-manifests/flexvolume/dummy-attachable b/test/e2e/testing-manifests/flexvolume/dummy-attachable index 07cb995db2b..2c47faaf3fe 100755 --- a/test/e2e/testing-manifests/flexvolume/dummy-attachable +++ b/test/e2e/testing-manifests/flexvolume/dummy-attachable @@ -90,11 +90,23 @@ unmountdevice() { exit 0 } +expandvolume() { + debug "expandvolume $@" + log "{\"status\":\"Success\"}" + exit 0 +} + +expandfs() { + debug "expandfs $@" + log "{\"status\":\"Success\"}" + exit 0 +} + op=$1 if [ "$op" = "init" ]; then debug "init $@" - log "{\"status\":\"Success\",\"capabilities\":{\"attach\":true}}" + log "{\"status\":\"Success\",\"capabilities\":{\"attach\":true, \"requiresFSResize\":true}}" exit 0 fi @@ -119,6 +131,12 @@ case "$op" in unmountdevice) unmountdevice $* ;; + expandvolume) + expandvolume $* + ;; + expandfs) + expandfs $* + ;; *) log "{\"status\":\"Not supported\"}" exit 0