github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Rename functions to eliminate master word

Browse Source
This commit is contained in:
wojtekt 2021-03-09 21:06:28 +01:00
parent 99fdb84ae8
commit f5fab2672e
2 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -114,7 +114,7 @@ var _ = ginkgo.Describe("Upgrade [Feature:Upgrade]", func() {
} }
testSuite.TestCases = append(testSuite.TestCases, masterUpgradeTest, nil) 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) 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"} clusterUpgradeTest := &junit.TestCase{Name: "[sig-cloud-provider-gcp] cluster-upgrade", Classname: "upgrade_tests"}
testSuite.TestCases = append(testSuite.TestCases, clusterUpgradeTest) 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) 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"} clusterDowngradeTest := &junit.TestCase{Name: "[sig-cloud-provider-gcp] cluster-downgrade", Classname: "upgrade_tests"}
testSuite.TestCases = append(testSuite.TestCases, clusterDowngradeTest) 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) 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"} gpuUpgradeTest := &junit.TestCase{Name: "[sig-node] gpu-master-upgrade", Classname: "upgrade_tests"}
testSuite.TestCases = append(testSuite.TestCases, gpuUpgradeTest) 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) 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"} gpuUpgradeTest := &junit.TestCase{Name: "[sig-node] gpu-cluster-upgrade", Classname: "upgrade_tests"}
testSuite.TestCases = append(testSuite.TestCases, gpuUpgradeTest) 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) 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"} gpuDowngradeTest := &junit.TestCase{Name: "[sig-node] gpu-cluster-downgrade", Classname: "upgrade_tests"}
testSuite.TestCases = append(testSuite.TestCases, gpuDowngradeTest) 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) 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"} statefulUpgradeTest := &junit.TestCase{Name: "[sig-apps] stateful-upgrade", Classname: "upgrade_tests"}
testSuite.TestCases = append(testSuite.TestCases, statefulUpgradeTest) 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) 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) testSuite.TestCases = append(testSuite.TestCases, kubeProxyUpgradeTest)
extraEnvs := kubeProxyDaemonSetExtraEnvs(true) extraEnvs := kubeProxyDaemonSetExtraEnvs(true)
upgradeFunc := clusterUpgradeFunc(f, upgCtx, kubeProxyUpgradeTest, extraEnvs, extraEnvs) upgradeFunc := ClusterUpgradeFunc(f, upgCtx, kubeProxyUpgradeTest, extraEnvs, extraEnvs)
runUpgradeSuite(upgCtx, kubeProxyUpgradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) 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) testSuite.TestCases = append(testSuite.TestCases, kubeProxyDowngradeTest)
extraEnvs := kubeProxyDaemonSetExtraEnvs(false) extraEnvs := kubeProxyDaemonSetExtraEnvs(false)
upgradeFunc := clusterDowngradeFunc(f, upgCtx, kubeProxyDowngradeTest, extraEnvs, extraEnvs) upgradeFunc := ClusterDowngradeFunc(f, upgCtx, kubeProxyDowngradeTest, extraEnvs, extraEnvs)
runUpgradeSuite(upgCtx, kubeProxyDowngradeTests, testSuite, upgrades.ClusterUpgrade, upgradeFunc) 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) testSuite.TestCases = append(testSuite.TestCases, serviceaccountAdmissionControllerMigrationTest)
extraEnvs := []string{"KUBE_FEATURE_GATES=BoundServiceAccountTokenVolume=true"} 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) runUpgradeSuite(upgCtx, serviceaccountAdmissionControllerMigrationTests, testSuite, upgrades.MasterUpgrade, upgradeFunc)
}) })
}) })

48
test/e2e/cloud/gcp/upgrade_mechanics.go
View File

@ -32,30 +32,33 @@ import (
"k8s.io/kubernetes/test/utils/junit" "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() { return func() {
start := time.Now() start := time.Now()
defer finalizeUpgradeTest(start, testCase) defer finalizeUpgradeTest(start, testCase)
target := upgCtx.Versions[1].Version.String() target := upgCtx.Versions[1].Version.String()
framework.ExpectNoError(masterUpgrade(f, target, masterExtraEnvs)) framework.ExpectNoError(controlPlaneUpgrade(f, target, controlPlaneExtraEnvs))
framework.ExpectNoError(checkMasterVersion(f.ClientSet, target)) 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() { return func() {
start := time.Now() start := time.Now()
defer finalizeUpgradeTest(start, testCase) defer finalizeUpgradeTest(start, testCase)
target := upgCtx.Versions[1].Version.String() target := upgCtx.Versions[1].Version.String()
image := upgCtx.Versions[1].NodeImage image := upgCtx.Versions[1].NodeImage
framework.ExpectNoError(masterUpgrade(f, target, masterExtraEnvs)) framework.ExpectNoError(controlPlaneUpgrade(f, target, controlPlaneExtraEnvs))
framework.ExpectNoError(checkMasterVersion(f.ClientSet, target)) framework.ExpectNoError(checkControlPlaneVersion(f.ClientSet, target))
framework.ExpectNoError(nodeUpgrade(f, target, image, nodeExtraEnvs)) framework.ExpectNoError(nodeUpgrade(f, target, image, nodeExtraEnvs))
framework.ExpectNoError(checkNodesVersions(f.ClientSet, target)) 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() { return func() {
start := time.Now() start := time.Now()
defer finalizeUpgradeTest(start, testCase) 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. // Yes this really is a downgrade. And nodes must downgrade first.
framework.ExpectNoError(nodeUpgrade(f, target, image, nodeExtraEnvs)) framework.ExpectNoError(nodeUpgrade(f, target, image, nodeExtraEnvs))
framework.ExpectNoError(checkNodesVersions(f.ClientSet, target)) framework.ExpectNoError(checkNodesVersions(f.ClientSet, target))
framework.ExpectNoError(masterUpgrade(f, target, masterExtraEnvs)) framework.ExpectNoError(controlPlaneUpgrade(f, target, controlPlaneExtraEnvs))
framework.ExpectNoError(checkMasterVersion(f.ClientSet, target)) framework.ExpectNoError(checkControlPlaneVersion(f.ClientSet, target))
} }
} }
// masterUpgrade upgrades master node on GCE/GKE. // controlPlaneUpgrade upgrades control plane node on GCE/GKE.
func masterUpgrade(f *framework.Framework, v string, extraEnvs []string) error { func controlPlaneUpgrade(f *framework.Framework, v string, extraEnvs []string) error {
switch framework.TestContext.Provider { switch framework.TestContext.Provider {
case "gce": case "gce":
return masterUpgradeGCE(v, extraEnvs) return controlPlaneUpgradeGCE(v, extraEnvs)
case "gke": case "gke":
return framework.MasterUpgradeGKE(f.Namespace.Name, v) return framework.MasterUpgradeGKE(f.Namespace.Name, v)
default: 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...) env := append(os.Environ(), extraEnvs...)
// TODO: Remove these variables when they're no longer needed for downgrades. // TODO: Remove these variables when they're no longer needed for downgrades.
if framework.TestContext.EtcdUpgradeVersion != "" && framework.TestContext.EtcdUpgradeStorage != "" { if framework.TestContext.EtcdUpgradeVersion != "" && framework.TestContext.EtcdUpgradeStorage != "" {
@ -100,7 +103,7 @@ func masterUpgradeGCE(rawV string, extraEnvs []string) error {
return err return err
} }
func traceRouteToMaster() { func traceRouteToControlPlane() {
traceroute, err := exec.LookPath("traceroute") traceroute, err := exec.LookPath("traceroute")
if err != nil { if err != nil {
framework.Logf("Could not find traceroute program") framework.Logf("Could not find traceroute program")
@ -116,30 +119,30 @@ func traceRouteToMaster() {
} }
} }
// checkMasterVersion validates the master version // checkControlPlaneVersion validates the control plane version
func checkMasterVersion(c clientset.Interface, want string) error { func checkControlPlaneVersion(c clientset.Interface, want string) error {
framework.Logf("Checking master version") framework.Logf("Checking control plane version")
var err error var err error
var v *version.Info var v *version.Info
waitErr := wait.PollImmediate(5*time.Second, 2*time.Minute, func() (bool, error) { waitErr := wait.PollImmediate(5*time.Second, 2*time.Minute, func() (bool, error) {
v, err = c.Discovery().ServerVersion() v, err = c.Discovery().ServerVersion()
if err != nil { if err != nil {
traceRouteToMaster() traceRouteToControlPlane()
return false, nil return false, nil
} }
return true, nil return true, nil
}) })
if waitErr != 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: // We do prefix trimming and then matching because:
// want looks like: 0.19.3-815-g50e67d4 // want looks like: 0.19.3-815-g50e67d4
// got looks like: v0.19.3-815-g50e67d4034e858-dirty // got looks like: v0.19.3-815-g50e67d4034e858-dirty
got := strings.TrimPrefix(v.GitVersion, "v") got := strings.TrimPrefix(v.GitVersion, "v")
if !strings.HasPrefix(got, want) { 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 return nil
} }
@ -266,4 +269,3 @@ func checkNodesVersions(cs clientset.Interface, want string) error {
} }
return nil return nil
} }