github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Compute upgradeContext once in upgrade tests

Browse Source
This commit is contained in:
wojtekt 2021-03-06 19:03:57 +01:00
parent 40a411a61a
commit 6d4a601b72
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/e2e/cloud/gcp/cluster_upgrade.go
View File

@ -159,7 +159,7 @@ var _ = ginkgo.Describe("Upgrade [Feature:Upgrade]", func() {
framework.ExpectNoError(masterUpgrade(f, target, nil)) framework.ExpectNoError(masterUpgrade(f, target, nil))
framework.ExpectNoError(checkMasterVersion(f.ClientSet, target)) framework.ExpectNoError(checkMasterVersion(f.ClientSet, target))
} }
runUpgradeSuite(f, upgradeTests, testSuite, upgrades.MasterUpgrade, upgradeFunc) runUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.MasterUpgrade, upgradeFunc)
}) })
}) })
@ -181,7 +181,7 @@ var _ = ginkgo.Describe("Upgrade [Feature:Upgrade]", func() {
framework.ExpectNoError(nodeUpgrade(f, target, *upgradeImage)) framework.ExpectNoError(nodeUpgrade(f, target, *upgradeImage))
framework.ExpectNoError(checkMasterVersion(f.ClientSet, target)) framework.ExpectNoError(checkMasterVersion(f.ClientSet, target))
} }
runUpgradeSuite(f, upgradeTests, testSuite, upgrades.NodeUpgrade, upgradeFunc) runUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.NodeUpgrade, upgradeFunc)
}) })
}) })
@ -202,7 +202,7 @@ var _ = ginkgo.Describe("Upgrade [Feature:Upgrade]", func() {
framework.ExpectNoError(nodeUpgrade(f, target, *upgradeImage)) framework.ExpectNoError(nodeUpgrade(f, target, *upgradeImage))
framework.ExpectNoError(checkNodesVersions(f.ClientSet, target)) framework.ExpectNoError(checkNodesVersions(f.ClientSet, target))
} }
runUpgradeSuite(f, upgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) runUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
}) })
}) })
}) })
@ -230,7 +230,7 @@ var _ = ginkgo.Describe("Downgrade [Feature:Downgrade]", func() {
framework.ExpectNoError(masterUpgrade(f, target, nil)) framework.ExpectNoError(masterUpgrade(f, target, nil))
framework.ExpectNoError(checkMasterVersion(f.ClientSet, target)) framework.ExpectNoError(checkMasterVersion(f.ClientSet, target))
} }
runUpgradeSuite(f, upgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) runUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
}) })
}) })
}) })
@ -240,6 +240,9 @@ var _ = ginkgo.Describe("etcd Upgrade [Feature:EtcdUpgrade]", func() {
ginkgo.Describe("etcd upgrade", func() { ginkgo.Describe("etcd upgrade", func() {
ginkgo.It("should maintain a functioning cluster", func() { ginkgo.It("should maintain a functioning cluster", func() {
upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), *upgradeTarget)
framework.ExpectNoError(err)
testSuite := &junit.TestSuite{Name: "Etcd upgrade"} testSuite := &junit.TestSuite{Name: "Etcd upgrade"}
etcdTest := &junit.TestCase{Name: "[sig-cloud-provider-gcp] etcd-upgrade", Classname: "upgrade_tests"} etcdTest := &junit.TestCase{Name: "[sig-cloud-provider-gcp] etcd-upgrade", Classname: "upgrade_tests"}
testSuite.TestCases = append(testSuite.TestCases, etcdTest) testSuite.TestCases = append(testSuite.TestCases, etcdTest)
@ -249,7 +252,7 @@ var _ = ginkgo.Describe("etcd Upgrade [Feature:EtcdUpgrade]", func() {
defer finalizeUpgradeTest(start, etcdTest) defer finalizeUpgradeTest(start, etcdTest)
framework.ExpectNoError(framework.EtcdUpgrade(framework.TestContext.EtcdUpgradeStorage, framework.TestContext.EtcdUpgradeVersion)) framework.ExpectNoError(framework.EtcdUpgrade(framework.TestContext.EtcdUpgradeStorage, framework.TestContext.EtcdUpgradeVersion))
} }
runUpgradeSuite(f, upgradeTests, testSuite, upgrades.EtcdUpgrade, upgradeFunc) runUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.EtcdUpgrade, upgradeFunc)
}) })
}) })
}) })
@ -273,7 +276,7 @@ var _ = ginkgo.Describe("gpu Upgrade [Feature:GPUUpgrade]", func() {
framework.ExpectNoError(masterUpgrade(f, target, nil)) framework.ExpectNoError(masterUpgrade(f, target, nil))
framework.ExpectNoError(checkMasterVersion(f.ClientSet, target)) framework.ExpectNoError(checkMasterVersion(f.ClientSet, target))
} }
runUpgradeSuite(f, gpuUpgradeTests, testSuite, upgrades.MasterUpgrade, upgradeFunc) runUpgradeSuite(upgCtx, gpuUpgradeTests, testSuite, upgrades.MasterUpgrade, upgradeFunc)
}) })
}) })
ginkgo.Describe("cluster upgrade", func() { ginkgo.Describe("cluster upgrade", func() {
@ -293,7 +296,7 @@ var _ = ginkgo.Describe("gpu Upgrade [Feature:GPUUpgrade]", func() {
framework.ExpectNoError(nodeUpgrade(f, target, *upgradeImage)) framework.ExpectNoError(nodeUpgrade(f, target, *upgradeImage))
framework.ExpectNoError(checkNodesVersions(f.ClientSet, target)) framework.ExpectNoError(checkNodesVersions(f.ClientSet, target))
} }
runUpgradeSuite(f, gpuUpgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) runUpgradeSuite(upgCtx, gpuUpgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
}) })
}) })
ginkgo.Describe("cluster downgrade", func() { ginkgo.Describe("cluster downgrade", func() {
@ -313,7 +316,7 @@ var _ = ginkgo.Describe("gpu Upgrade [Feature:GPUUpgrade]", func() {
framework.ExpectNoError(masterUpgrade(f, target, nil)) framework.ExpectNoError(masterUpgrade(f, target, nil))
framework.ExpectNoError(checkMasterVersion(f.ClientSet, target)) framework.ExpectNoError(checkMasterVersion(f.ClientSet, target))
} }
runUpgradeSuite(f, gpuUpgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) runUpgradeSuite(upgCtx, gpuUpgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
}) })
}) })
}) })
@ -339,7 +342,7 @@ var _ = ginkgo.Describe("[sig-apps] stateful Upgrade [Feature:StatefulUpgrade]",
framework.ExpectNoError(nodeUpgrade(f, target, *upgradeImage)) framework.ExpectNoError(nodeUpgrade(f, target, *upgradeImage))
framework.ExpectNoError(checkNodesVersions(f.ClientSet, target)) framework.ExpectNoError(checkNodesVersions(f.ClientSet, target))
} }
runUpgradeSuite(f, statefulsetUpgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) runUpgradeSuite(upgCtx, statefulsetUpgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
}) })
}) })
}) })
@ -373,7 +376,7 @@ var _ = ginkgo.Describe("kube-proxy migration [Feature:KubeProxyDaemonSetMigrati
framework.ExpectNoError(nodeUpgradeGCEWithKubeProxyDaemonSet(f, target, *upgradeImage, true)) framework.ExpectNoError(nodeUpgradeGCEWithKubeProxyDaemonSet(f, target, *upgradeImage, true))
framework.ExpectNoError(checkNodesVersions(f.ClientSet, target)) framework.ExpectNoError(checkNodesVersions(f.ClientSet, target))
} }
runUpgradeSuite(f, kubeProxyUpgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) runUpgradeSuite(upgCtx, kubeProxyUpgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
}) })
}) })
@ -399,7 +402,7 @@ var _ = ginkgo.Describe("kube-proxy migration [Feature:KubeProxyDaemonSetMigrati
framework.ExpectNoError(masterUpgradeGCEWithKubeProxyDaemonSet(target, false)) framework.ExpectNoError(masterUpgradeGCEWithKubeProxyDaemonSet(target, false))
framework.ExpectNoError(checkMasterVersion(f.ClientSet, target)) framework.ExpectNoError(checkMasterVersion(f.ClientSet, target))
} }
runUpgradeSuite(f, kubeProxyDowngradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) runUpgradeSuite(upgCtx, kubeProxyDowngradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc)
}) })
}) })
}) })
@ -426,7 +429,7 @@ var _ = ginkgo.Describe("[sig-auth] ServiceAccount admission controller migratio
target := upgCtx.Versions[1].Version.String() target := upgCtx.Versions[1].Version.String()
framework.ExpectNoError(masterUpgrade(f, target, []string{"KUBE_FEATURE_GATES=BoundServiceAccountTokenVolume=true"})) framework.ExpectNoError(masterUpgrade(f, target, []string{"KUBE_FEATURE_GATES=BoundServiceAccountTokenVolume=true"}))
} }
runUpgradeSuite(f, serviceaccountAdmissionControllerMigrationTests, testSuite, upgrades.MasterUpgrade, upgradeFunc) runUpgradeSuite(upgCtx, serviceaccountAdmissionControllerMigrationTests, testSuite, upgrades.MasterUpgrade, upgradeFunc)
}) })
}) })
}) })
@ -502,15 +505,12 @@ func createUpgradeFrameworks(tests []upgrades.Test) map[string]*framework.Framew
} }
func runUpgradeSuite( func runUpgradeSuite(
f *framework.Framework, upgCtx *upgrades.UpgradeContext,
tests []upgrades.Test, tests []upgrades.Test,
testSuite *junit.TestSuite, testSuite *junit.TestSuite,
upgradeType upgrades.UpgradeType, upgradeType upgrades.UpgradeType,
upgradeFunc func(), upgradeFunc func(),
) { ) {
upgCtx, err := getUpgradeContext(f.ClientSet.Discovery(), *upgradeTarget)
framework.ExpectNoError(err)
testFrameworks := createUpgradeFrameworks(tests) testFrameworks := createUpgradeFrameworks(tests)
cm := chaosmonkey.New(upgradeFunc) cm := chaosmonkey.New(upgradeFunc)