From f5fab2672ef3e9ca87fc48dd641973e303e0b8b7 Mon Sep 17 00:00:00 2001 From: wojtekt Date: Tue, 9 Mar 2021 21:06:28 +0100 Subject: [PATCH] Rename functions to eliminate master word --- test/e2e/cloud/gcp/cluster_upgrade.go | 20 +++++------ test/e2e/cloud/gcp/upgrade_mechanics.go | 48 +++++++++++++------------ 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/test/e2e/cloud/gcp/cluster_upgrade.go b/test/e2e/cloud/gcp/cluster_upgrade.go index bc51f586d8d..e3b3981e4a3 100644 --- a/test/e2e/cloud/gcp/cluster_upgrade.go +++ b/test/e2e/cloud/gcp/cluster_upgrade.go @@ -114,7 +114,7 @@ var _ = ginkgo.Describe("Upgrade [Feature:Upgrade]", func() { } testSuite.TestCases = append(testSuite.TestCases, masterUpgradeTest, nil) - upgradeFunc := masterUpgradeFunc(f, upgCtx, masterUpgradeTest, nil) + upgradeFunc := ControlPlaneUpgradeFunc(f, upgCtx, masterUpgradeTest, nil) runUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.MasterUpgrade, upgradeFunc) }) }) @@ -128,7 +128,7 @@ var _ = ginkgo.Describe("Upgrade [Feature:Upgrade]", func() { clusterUpgradeTest := &junit.TestCase{Name: "[sig-cloud-provider-gcp] cluster-upgrade", Classname: "upgrade_tests"} testSuite.TestCases = append(testSuite.TestCases, clusterUpgradeTest) - upgradeFunc := clusterUpgradeFunc(f, upgCtx, clusterUpgradeTest, nil, nil) + upgradeFunc := ClusterUpgradeFunc(f, upgCtx, clusterUpgradeTest, nil, nil) runUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) }) }) @@ -147,7 +147,7 @@ var _ = ginkgo.Describe("Downgrade [Feature:Downgrade]", func() { clusterDowngradeTest := &junit.TestCase{Name: "[sig-cloud-provider-gcp] cluster-downgrade", Classname: "upgrade_tests"} testSuite.TestCases = append(testSuite.TestCases, clusterDowngradeTest) - upgradeFunc := clusterDowngradeFunc(f, upgCtx, clusterDowngradeTest, nil, nil) + upgradeFunc := ClusterDowngradeFunc(f, upgCtx, clusterDowngradeTest, nil, nil) runUpgradeSuite(upgCtx, upgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) }) }) @@ -188,7 +188,7 @@ var _ = ginkgo.Describe("gpu Upgrade [Feature:GPUUpgrade]", func() { gpuUpgradeTest := &junit.TestCase{Name: "[sig-node] gpu-master-upgrade", Classname: "upgrade_tests"} testSuite.TestCases = append(testSuite.TestCases, gpuUpgradeTest) - upgradeFunc := masterUpgradeFunc(f, upgCtx, gpuUpgradeTest, nil) + upgradeFunc := ControlPlaneUpgradeFunc(f, upgCtx, gpuUpgradeTest, nil) runUpgradeSuite(upgCtx, gpuUpgradeTests, testSuite, upgrades.MasterUpgrade, upgradeFunc) }) }) @@ -201,7 +201,7 @@ var _ = ginkgo.Describe("gpu Upgrade [Feature:GPUUpgrade]", func() { gpuUpgradeTest := &junit.TestCase{Name: "[sig-node] gpu-cluster-upgrade", Classname: "upgrade_tests"} testSuite.TestCases = append(testSuite.TestCases, gpuUpgradeTest) - upgradeFunc := clusterUpgradeFunc(f, upgCtx, gpuUpgradeTest, nil, nil) + upgradeFunc := ClusterUpgradeFunc(f, upgCtx, gpuUpgradeTest, nil, nil) runUpgradeSuite(upgCtx, gpuUpgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) }) }) @@ -214,7 +214,7 @@ var _ = ginkgo.Describe("gpu Upgrade [Feature:GPUUpgrade]", func() { gpuDowngradeTest := &junit.TestCase{Name: "[sig-node] gpu-cluster-downgrade", Classname: "upgrade_tests"} testSuite.TestCases = append(testSuite.TestCases, gpuDowngradeTest) - upgradeFunc := clusterDowngradeFunc(f, upgCtx, gpuDowngradeTest, nil, nil) + upgradeFunc := ClusterDowngradeFunc(f, upgCtx, gpuDowngradeTest, nil, nil) runUpgradeSuite(upgCtx, gpuUpgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) }) }) @@ -233,7 +233,7 @@ var _ = ginkgo.Describe("[sig-apps] stateful Upgrade [Feature:StatefulUpgrade]", statefulUpgradeTest := &junit.TestCase{Name: "[sig-apps] stateful-upgrade", Classname: "upgrade_tests"} testSuite.TestCases = append(testSuite.TestCases, statefulUpgradeTest) - upgradeFunc := clusterUpgradeFunc(f, upgCtx, statefulUpgradeTest, nil, nil) + upgradeFunc := ClusterUpgradeFunc(f, upgCtx, statefulUpgradeTest, nil, nil) runUpgradeSuite(upgCtx, statefulsetUpgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) }) }) @@ -260,7 +260,7 @@ var _ = ginkgo.Describe("kube-proxy migration [Feature:KubeProxyDaemonSetMigrati testSuite.TestCases = append(testSuite.TestCases, kubeProxyUpgradeTest) extraEnvs := kubeProxyDaemonSetExtraEnvs(true) - upgradeFunc := clusterUpgradeFunc(f, upgCtx, kubeProxyUpgradeTest, extraEnvs, extraEnvs) + upgradeFunc := ClusterUpgradeFunc(f, upgCtx, kubeProxyUpgradeTest, extraEnvs, extraEnvs) runUpgradeSuite(upgCtx, kubeProxyUpgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) }) }) @@ -278,7 +278,7 @@ var _ = ginkgo.Describe("kube-proxy migration [Feature:KubeProxyDaemonSetMigrati testSuite.TestCases = append(testSuite.TestCases, kubeProxyDowngradeTest) extraEnvs := kubeProxyDaemonSetExtraEnvs(false) - upgradeFunc := clusterDowngradeFunc(f, upgCtx, kubeProxyDowngradeTest, extraEnvs, extraEnvs) + upgradeFunc := ClusterDowngradeFunc(f, upgCtx, kubeProxyDowngradeTest, extraEnvs, extraEnvs) runUpgradeSuite(upgCtx, kubeProxyDowngradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) }) }) @@ -301,7 +301,7 @@ var _ = ginkgo.Describe("[sig-auth] ServiceAccount admission controller migratio testSuite.TestCases = append(testSuite.TestCases, serviceaccountAdmissionControllerMigrationTest) extraEnvs := []string{"KUBE_FEATURE_GATES=BoundServiceAccountTokenVolume=true"} - upgradeFunc := masterUpgradeFunc(f, upgCtx, serviceaccountAdmissionControllerMigrationTest, extraEnvs) + upgradeFunc := ControlPlaneUpgradeFunc(f, upgCtx, serviceaccountAdmissionControllerMigrationTest, extraEnvs) runUpgradeSuite(upgCtx, serviceaccountAdmissionControllerMigrationTests, testSuite, upgrades.MasterUpgrade, upgradeFunc) }) }) diff --git a/test/e2e/cloud/gcp/upgrade_mechanics.go b/test/e2e/cloud/gcp/upgrade_mechanics.go index 14a57d04c83..3f2e721b2b4 100644 --- a/test/e2e/cloud/gcp/upgrade_mechanics.go +++ b/test/e2e/cloud/gcp/upgrade_mechanics.go @@ -32,30 +32,33 @@ import ( "k8s.io/kubernetes/test/utils/junit" ) -func masterUpgradeFunc(f *framework.Framework, upgCtx *upgrades.UpgradeContext, testCase *junit.TestCase, masterExtraEnvs []string) func() { +// ControlPlaneUpgradeFunc returns a function that performs control plane upgrade. +func ControlPlaneUpgradeFunc(f *framework.Framework, upgCtx *upgrades.UpgradeContext, testCase *junit.TestCase, controlPlaneExtraEnvs []string) func() { return func() { start := time.Now() defer finalizeUpgradeTest(start, testCase) target := upgCtx.Versions[1].Version.String() - framework.ExpectNoError(masterUpgrade(f, target, masterExtraEnvs)) - framework.ExpectNoError(checkMasterVersion(f.ClientSet, target)) + framework.ExpectNoError(controlPlaneUpgrade(f, target, controlPlaneExtraEnvs)) + framework.ExpectNoError(checkControlPlaneVersion(f.ClientSet, target)) } } -func clusterUpgradeFunc(f *framework.Framework, upgCtx *upgrades.UpgradeContext, testCase *junit.TestCase, masterExtraEnvs, nodeExtraEnvs []string) func() { +// ClusterUpgradeFunc returns a function that performs full cluster upgrade (both control plane and nodes). +func ClusterUpgradeFunc(f *framework.Framework, upgCtx *upgrades.UpgradeContext, testCase *junit.TestCase, controlPlaneExtraEnvs, nodeExtraEnvs []string) func() { return func() { start := time.Now() defer finalizeUpgradeTest(start, testCase) target := upgCtx.Versions[1].Version.String() image := upgCtx.Versions[1].NodeImage - framework.ExpectNoError(masterUpgrade(f, target, masterExtraEnvs)) - framework.ExpectNoError(checkMasterVersion(f.ClientSet, target)) + framework.ExpectNoError(controlPlaneUpgrade(f, target, controlPlaneExtraEnvs)) + framework.ExpectNoError(checkControlPlaneVersion(f.ClientSet, target)) framework.ExpectNoError(nodeUpgrade(f, target, image, nodeExtraEnvs)) framework.ExpectNoError(checkNodesVersions(f.ClientSet, target)) } } -func clusterDowngradeFunc(f *framework.Framework, upgCtx *upgrades.UpgradeContext, testCase *junit.TestCase, masterExtraEnvs, nodeExtraEnvs []string) func() { +// ClusterDowngradeFunc returns a function that performs full cluster downgrade (both nodes and control plane). +func ClusterDowngradeFunc(f *framework.Framework, upgCtx *upgrades.UpgradeContext, testCase *junit.TestCase, controlPlaneExtraEnvs, nodeExtraEnvs []string) func() { return func() { start := time.Now() defer finalizeUpgradeTest(start, testCase) @@ -64,24 +67,24 @@ func clusterDowngradeFunc(f *framework.Framework, upgCtx *upgrades.UpgradeContex // Yes this really is a downgrade. And nodes must downgrade first. framework.ExpectNoError(nodeUpgrade(f, target, image, nodeExtraEnvs)) framework.ExpectNoError(checkNodesVersions(f.ClientSet, target)) - framework.ExpectNoError(masterUpgrade(f, target, masterExtraEnvs)) - framework.ExpectNoError(checkMasterVersion(f.ClientSet, target)) + framework.ExpectNoError(controlPlaneUpgrade(f, target, controlPlaneExtraEnvs)) + framework.ExpectNoError(checkControlPlaneVersion(f.ClientSet, target)) } } -// masterUpgrade upgrades master node on GCE/GKE. -func masterUpgrade(f *framework.Framework, v string, extraEnvs []string) error { +// controlPlaneUpgrade upgrades control plane node on GCE/GKE. +func controlPlaneUpgrade(f *framework.Framework, v string, extraEnvs []string) error { switch framework.TestContext.Provider { case "gce": - return masterUpgradeGCE(v, extraEnvs) + return controlPlaneUpgradeGCE(v, extraEnvs) case "gke": return framework.MasterUpgradeGKE(f.Namespace.Name, v) default: - return fmt.Errorf("masterUpgrade() is not implemented for provider %s", framework.TestContext.Provider) + return fmt.Errorf("controlPlaneUpgrade() is not implemented for provider %s", framework.TestContext.Provider) } } -func masterUpgradeGCE(rawV string, extraEnvs []string) error { +func controlPlaneUpgradeGCE(rawV string, extraEnvs []string) error { env := append(os.Environ(), extraEnvs...) // TODO: Remove these variables when they're no longer needed for downgrades. if framework.TestContext.EtcdUpgradeVersion != "" && framework.TestContext.EtcdUpgradeStorage != "" { @@ -100,7 +103,7 @@ func masterUpgradeGCE(rawV string, extraEnvs []string) error { return err } -func traceRouteToMaster() { +func traceRouteToControlPlane() { traceroute, err := exec.LookPath("traceroute") if err != nil { framework.Logf("Could not find traceroute program") @@ -116,30 +119,30 @@ func traceRouteToMaster() { } } -// checkMasterVersion validates the master version -func checkMasterVersion(c clientset.Interface, want string) error { - framework.Logf("Checking master version") +// checkControlPlaneVersion validates the control plane version +func checkControlPlaneVersion(c clientset.Interface, want string) error { + framework.Logf("Checking control plane version") var err error var v *version.Info waitErr := wait.PollImmediate(5*time.Second, 2*time.Minute, func() (bool, error) { v, err = c.Discovery().ServerVersion() if err != nil { - traceRouteToMaster() + traceRouteToControlPlane() return false, nil } return true, nil }) if waitErr != nil { - return fmt.Errorf("CheckMasterVersion() couldn't get the master version: %v", err) + return fmt.Errorf("CheckControlPlane() couldn't get the control plane version: %v", err) } // We do prefix trimming and then matching because: // want looks like: 0.19.3-815-g50e67d4 // got looks like: v0.19.3-815-g50e67d4034e858-dirty got := strings.TrimPrefix(v.GitVersion, "v") if !strings.HasPrefix(got, want) { - return fmt.Errorf("master had kube-apiserver version %s which does not start with %s", got, want) + return fmt.Errorf("control plane had kube-apiserver version %s which does not start with %s", got, want) } - framework.Logf("Master is at version %s", want) + framework.Logf("Control plane is at version %s", want) return nil } @@ -266,4 +269,3 @@ func checkNodesVersions(cs clientset.Interface, want string) error { } return nil } -