github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82760 from gnufied/fix-upgrade-e2e-tests

Browse Source 
Allow upgrade test to run on all cloudproviders
This commit is contained in:
Kubernetes Prow Robot 2019-09-16 18:06:48 -07:00 committed by GitHub
commit 9d8acc02b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/upgrades/storage/BUILD
View File

@ -20,7 +20,6 @@ go_library(
"//test/e2e/framework:go_default_library", "//test/e2e/framework:go_default_library",
"//test/e2e/framework/log:go_default_library", "//test/e2e/framework/log:go_default_library",
"//test/e2e/framework/pod:go_default_library", "//test/e2e/framework/pod:go_default_library",
"//test/e2e/framework/volume:go_default_library",
"//test/e2e/storage/utils:go_default_library", "//test/e2e/storage/utils:go_default_library",
"//test/e2e/upgrades:go_default_library", "//test/e2e/upgrades:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library",

36
test/e2e/upgrades/storage/persistent_volumes.go
View File

@ -22,7 +22,6 @@ import (
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
e2elog "k8s.io/kubernetes/test/e2e/framework/log" e2elog "k8s.io/kubernetes/test/e2e/framework/log"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
"k8s.io/kubernetes/test/e2e/framework/volume"
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
"k8s.io/kubernetes/test/e2e/upgrades" "k8s.io/kubernetes/test/e2e/upgrades"
@ -30,9 +29,7 @@ import (
// PersistentVolumeUpgradeTest test that a pv is available before and after a cluster upgrade. // PersistentVolumeUpgradeTest test that a pv is available before and after a cluster upgrade.
type PersistentVolumeUpgradeTest struct { type PersistentVolumeUpgradeTest struct {
pvSource *v1.PersistentVolumeSource pvc *v1.PersistentVolumeClaim
pv *v1.PersistentVolume
pvc *v1.PersistentVolumeClaim
} }
// Name returns the tracking name of the test. // Name returns the tracking name of the test.
@ -45,33 +42,21 @@ const (
pvReadCmd string = "cat " + pvTestFile pvReadCmd string = "cat " + pvTestFile
) )
func (t *PersistentVolumeUpgradeTest) deleteGCEVolume(pvSource *v1.PersistentVolumeSource) error {
return framework.DeletePDWithRetry(pvSource.GCEPersistentDisk.PDName)
}
// Setup creates a pv and then verifies that a pod can consume it. The pod writes data to the volume. // Setup creates a pv and then verifies that a pod can consume it. The pod writes data to the volume.
func (t *PersistentVolumeUpgradeTest) Setup(f *framework.Framework) { func (t *PersistentVolumeUpgradeTest) Setup(f *framework.Framework) {
var err error var err error
// TODO: generalize this to other providers framework.SkipUnlessProviderIs("gce", "gke", "openstack", "aws", "vsphere", "azure")
framework.SkipUnlessProviderIs("gce", "gke")
ns := f.Namespace.Name ns := f.Namespace.Name
ginkgo.By("Initializing PV source") ginkgo.By("Creating a PVC")
t.pvSource, _ = volume.CreateGCEVolume() pvcConfig := framework.PersistentVolumeClaimConfig{
pvConfig := framework.PersistentVolumeConfig{ StorageClassName: nil,
NamePrefix: "pv-upgrade",
PVSource: *t.pvSource,
Prebind: nil,
} }
emptyStorageClass := "" t.pvc = framework.MakePersistentVolumeClaim(pvcConfig, ns)
pvcConfig := framework.PersistentVolumeClaimConfig{StorageClassName: &emptyStorageClass} t.pvc, err = framework.CreatePVC(f.ClientSet, ns, t.pvc)
ginkgo.By("Creating the PV and PVC")
t.pv, t.pvc, err = framework.CreatePVPVC(f.ClientSet, pvConfig, pvcConfig, ns, true)
framework.ExpectNoError(err) framework.ExpectNoError(err)
framework.ExpectNoError(framework.WaitOnPVandPVC(f.ClientSet, ns, t.pv, t.pvc))
ginkgo.By("Consuming the PV before upgrade") ginkgo.By("Consuming the PV before upgrade")
t.testPod(f, pvWriteCmd+";"+pvReadCmd) t.testPod(f, pvWriteCmd+";"+pvReadCmd)
@ -87,12 +72,9 @@ func (t *PersistentVolumeUpgradeTest) Test(f *framework.Framework, done <-chan s
// Teardown cleans up any remaining resources. // Teardown cleans up any remaining resources.
func (t *PersistentVolumeUpgradeTest) Teardown(f *framework.Framework) { func (t *PersistentVolumeUpgradeTest) Teardown(f *framework.Framework) {
errs := framework.PVPVCCleanup(f.ClientSet, f.Namespace.Name, t.pv, t.pvc) errs := framework.PVPVCCleanup(f.ClientSet, f.Namespace.Name, nil, t.pvc)
if err := t.deleteGCEVolume(t.pvSource); err != nil {
errs = append(errs, err)
}
if len(errs) > 0 { if len(errs) > 0 {
e2elog.Failf("Failed to delete 1 or more PVs/PVCs and/or the GCE volume. Errors: %v", utilerrors.NewAggregate(errs)) e2elog.Failf("Failed to delete 1 or more PVs/PVCs. Errors: %v", utilerrors.NewAggregate(errs))
} }
} }