This is the result of automatically editing source files like this:
go install golang.org/x/tools/cmd/goimports@latest
find ./test/e2e* -name "*.go" | xargs env PATH=$GOPATH/bin:$PATH ./e2e-framework-sed.sh
with e2e-framework-sed.sh containing this:
sed -i \
-e "s/\(f\|fr\|\w\w*\.[fF]\w*\)\.ExecCommandInContainer(/e2epod.ExecCommandInContainer(\1, /" \
-e "s/\(f\|fr\|\w\w*\.[fF]\w*\)\.ExecCommandInContainerWithFullOutput(/e2epod.ExecCommandInContainerWithFullOutput(\1, /" \
-e "s/\(f\|fr\|\w\w*\.[fF]\w*\)\.ExecShellInContainer(/e2epod.ExecShellInContainer(\1, /" \
-e "s/\(f\|fr\|\w\w*\.[fF]\w*\)\.ExecShellInPod(/e2epod.ExecShellInPod(\1, /" \
-e "s/\(f\|fr\|\w\w*\.[fF]\w*\)\.ExecShellInPodWithFullOutput(/e2epod.ExecShellInPodWithFullOutput(\1, /" \
-e "s/\(f\|fr\|\w\w*\.[fF]\w*\)\.ExecWithOptions(/e2epod.ExecWithOptions(\1, /" \
-e "s/\(f\|fr\|\w\w*\.[fF]\w*\)\.MatchContainerOutput(/e2eoutput.MatchContainerOutput(\1, /" \
-e "s/\(f\|fr\|\w\w*\.[fF]\w*\)\.PodClient(/e2epod.NewPodClient(\1, /" \
-e "s/\(f\|fr\|\w\w*\.[fF]\w*\)\.PodClientNS(/e2epod.PodClientNS(\1, /" \
-e "s/\(f\|fr\|\w\w*\.[fF]\w*\)\.TestContainerOutput(/e2eoutput.TestContainerOutput(\1, /" \
-e "s/\(f\|fr\|\w\w*\.[fF]\w*\)\.TestContainerOutputRegexp(/e2eoutput.TestContainerOutputRegexp(\1, /" \
-e "s/framework.AddOrUpdateLabelOnNode\b/e2enode.AddOrUpdateLabelOnNode/" \
-e "s/framework.AllNodes\b/e2edebug.AllNodes/" \
-e "s/framework.AllNodesReady\b/e2enode.AllNodesReady/" \
-e "s/framework.ContainerResourceGatherer\b/e2edebug.ContainerResourceGatherer/" \
-e "s/framework.ContainerResourceUsage\b/e2edebug.ContainerResourceUsage/" \
-e "s/framework.CreateEmptyFileOnPod\b/e2eoutput.CreateEmptyFileOnPod/" \
-e "s/framework.DefaultPodDeletionTimeout\b/e2epod.DefaultPodDeletionTimeout/" \
-e "s/framework.DumpAllNamespaceInfo\b/e2edebug.DumpAllNamespaceInfo/" \
-e "s/framework.DumpDebugInfo\b/e2eoutput.DumpDebugInfo/" \
-e "s/framework.DumpNodeDebugInfo\b/e2edebug.DumpNodeDebugInfo/" \
-e "s/framework.EtcdUpgrade\b/e2eproviders.EtcdUpgrade/" \
-e "s/framework.EventsLister\b/e2edebug.EventsLister/" \
-e "s/framework.ExecOptions\b/e2epod.ExecOptions/" \
-e "s/framework.ExpectNodeHasLabel\b/e2enode.ExpectNodeHasLabel/" \
-e "s/framework.ExpectNodeHasTaint\b/e2enode.ExpectNodeHasTaint/" \
-e "s/framework.GCEUpgradeScript\b/e2eproviders.GCEUpgradeScript/" \
-e "s/framework.ImagePrePullList\b/e2epod.ImagePrePullList/" \
-e "s/framework.KubectlBuilder\b/e2ekubectl.KubectlBuilder/" \
-e "s/framework.LocationParamGKE\b/e2eproviders.LocationParamGKE/" \
-e "s/framework.LogSizeDataTimeseries\b/e2edebug.LogSizeDataTimeseries/" \
-e "s/framework.LogSizeGatherer\b/e2edebug.LogSizeGatherer/" \
-e "s/framework.LogsSizeData\b/e2edebug.LogsSizeData/" \
-e "s/framework.LogsSizeDataSummary\b/e2edebug.LogsSizeDataSummary/" \
-e "s/framework.LogsSizeVerifier\b/e2edebug.LogsSizeVerifier/" \
-e "s/framework.LookForStringInLog\b/e2eoutput.LookForStringInLog/" \
-e "s/framework.LookForStringInPodExec\b/e2eoutput.LookForStringInPodExec/" \
-e "s/framework.LookForStringInPodExecToContainer\b/e2eoutput.LookForStringInPodExecToContainer/" \
-e "s/framework.MasterAndDNSNodes\b/e2edebug.MasterAndDNSNodes/" \
-e "s/framework.MasterNodes\b/e2edebug.MasterNodes/" \
-e "s/framework.MasterUpgradeGKE\b/e2eproviders.MasterUpgradeGKE/" \
-e "s/framework.NewKubectlCommand\b/e2ekubectl.NewKubectlCommand/" \
-e "s/framework.NewLogsVerifier\b/e2edebug.NewLogsVerifier/" \
-e "s/framework.NewNodeKiller\b/e2enode.NewNodeKiller/" \
-e "s/framework.NewResourceUsageGatherer\b/e2edebug.NewResourceUsageGatherer/" \
-e "s/framework.NodeHasTaint\b/e2enode.NodeHasTaint/" \
-e "s/framework.NodeKiller\b/e2enode.NodeKiller/" \
-e "s/framework.NodesSet\b/e2edebug.NodesSet/" \
-e "s/framework.PodClient\b/e2epod.PodClient/" \
-e "s/framework.RemoveLabelOffNode\b/e2enode.RemoveLabelOffNode/" \
-e "s/framework.ResourceConstraint\b/e2edebug.ResourceConstraint/" \
-e "s/framework.ResourceGathererOptions\b/e2edebug.ResourceGathererOptions/" \
-e "s/framework.ResourceUsagePerContainer\b/e2edebug.ResourceUsagePerContainer/" \
-e "s/framework.ResourceUsageSummary\b/e2edebug.ResourceUsageSummary/" \
-e "s/framework.RunHostCmd\b/e2eoutput.RunHostCmd/" \
-e "s/framework.RunHostCmdOrDie\b/e2eoutput.RunHostCmdOrDie/" \
-e "s/framework.RunHostCmdWithFullOutput\b/e2eoutput.RunHostCmdWithFullOutput/" \
-e "s/framework.RunHostCmdWithRetries\b/e2eoutput.RunHostCmdWithRetries/" \
-e "s/framework.RunKubectl\b/e2ekubectl.RunKubectl/" \
-e "s/framework.RunKubectlInput\b/e2ekubectl.RunKubectlInput/" \
-e "s/framework.RunKubectlOrDie\b/e2ekubectl.RunKubectlOrDie/" \
-e "s/framework.RunKubectlOrDieInput\b/e2ekubectl.RunKubectlOrDieInput/" \
-e "s/framework.RunKubectlWithFullOutput\b/e2ekubectl.RunKubectlWithFullOutput/" \
-e "s/framework.RunKubemciCmd\b/e2ekubectl.RunKubemciCmd/" \
-e "s/framework.RunKubemciWithKubeconfig\b/e2ekubectl.RunKubemciWithKubeconfig/" \
-e "s/framework.SingleContainerSummary\b/e2edebug.SingleContainerSummary/" \
-e "s/framework.SingleLogSummary\b/e2edebug.SingleLogSummary/" \
-e "s/framework.TimestampedSize\b/e2edebug.TimestampedSize/" \
-e "s/framework.WaitForAllNodesSchedulable\b/e2enode.WaitForAllNodesSchedulable/" \
-e "s/framework.WaitForSSHTunnels\b/e2enode.WaitForSSHTunnels/" \
-e "s/framework.WorkItem\b/e2edebug.WorkItem/" \
"$@"
for i in "$@"; do
# Import all sub packages and let goimports figure out which of those
# are redundant (= already imported) or not needed.
sed -i -e '/"k8s.io.kubernetes.test.e2e.framework"/a e2edebug "k8s.io/kubernetes/test/e2e/framework/debug"' "$i"
sed -i -e '/"k8s.io.kubernetes.test.e2e.framework"/a e2ekubectl "k8s.io/kubernetes/test/e2e/framework/kubectl"' "$i"
sed -i -e '/"k8s.io.kubernetes.test.e2e.framework"/a e2enode "k8s.io/kubernetes/test/e2e/framework/node"' "$i"
sed -i -e '/"k8s.io.kubernetes.test.e2e.framework"/a e2eoutput "k8s.io/kubernetes/test/e2e/framework/pod/output"' "$i"
sed -i -e '/"k8s.io.kubernetes.test.e2e.framework"/a e2epod "k8s.io/kubernetes/test/e2e/framework/pod"' "$i"
sed -i -e '/"k8s.io.kubernetes.test.e2e.framework"/a e2eproviders "k8s.io/kubernetes/test/e2e/framework/providers"' "$i"
goimports -w "$i"
done
275 lines
9.5 KiB
Go
275 lines
9.5 KiB
Go
/*
|
|
Copyright 2021 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 common
|
|
|
|
import (
|
|
"fmt"
|
|
"os"
|
|
"os/exec"
|
|
"strings"
|
|
"time"
|
|
|
|
"k8s.io/apimachinery/pkg/util/wait"
|
|
"k8s.io/apimachinery/pkg/version"
|
|
clientset "k8s.io/client-go/kubernetes"
|
|
"k8s.io/kubernetes/test/e2e/framework"
|
|
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
|
|
e2eproviders "k8s.io/kubernetes/test/e2e/framework/providers"
|
|
"k8s.io/kubernetes/test/e2e/upgrades"
|
|
"k8s.io/kubernetes/test/utils/junit"
|
|
)
|
|
|
|
// 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 upgrades.FinalizeUpgradeTest(start, testCase)
|
|
target := upgCtx.Versions[1].Version.String()
|
|
framework.ExpectNoError(controlPlaneUpgrade(f, target, controlPlaneExtraEnvs))
|
|
framework.ExpectNoError(checkControlPlaneVersion(f.ClientSet, target))
|
|
}
|
|
}
|
|
|
|
// 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 upgrades.FinalizeUpgradeTest(start, testCase)
|
|
target := upgCtx.Versions[1].Version.String()
|
|
image := upgCtx.Versions[1].NodeImage
|
|
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))
|
|
}
|
|
}
|
|
|
|
// 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 upgrades.FinalizeUpgradeTest(start, testCase)
|
|
target := upgCtx.Versions[1].Version.String()
|
|
image := upgCtx.Versions[1].NodeImage
|
|
// 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(controlPlaneUpgrade(f, target, controlPlaneExtraEnvs))
|
|
framework.ExpectNoError(checkControlPlaneVersion(f.ClientSet, target))
|
|
}
|
|
}
|
|
|
|
const etcdImage = "3.4.9-1"
|
|
|
|
// 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 controlPlaneUpgradeGCE(v, extraEnvs)
|
|
case "gke":
|
|
return e2eproviders.MasterUpgradeGKE(f.Namespace.Name, v)
|
|
default:
|
|
return fmt.Errorf("controlPlaneUpgrade() is not implemented for provider %s", framework.TestContext.Provider)
|
|
}
|
|
}
|
|
|
|
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 != "" {
|
|
env = append(env,
|
|
"TEST_ETCD_VERSION="+framework.TestContext.EtcdUpgradeVersion,
|
|
"STORAGE_BACKEND="+framework.TestContext.EtcdUpgradeStorage,
|
|
"TEST_ETCD_IMAGE="+etcdImage)
|
|
} else {
|
|
// In e2e tests, we skip the confirmation prompt about
|
|
// implicit etcd upgrades to simulate the user entering "y".
|
|
env = append(env, "TEST_ALLOW_IMPLICIT_ETCD_UPGRADE=true")
|
|
}
|
|
|
|
v := "v" + rawV
|
|
_, _, err := framework.RunCmdEnv(env, e2eproviders.GCEUpgradeScript(), "-M", v)
|
|
return err
|
|
}
|
|
|
|
func traceRouteToControlPlane() {
|
|
traceroute, err := exec.LookPath("traceroute")
|
|
if err != nil {
|
|
framework.Logf("Could not find traceroute program")
|
|
return
|
|
}
|
|
cmd := exec.Command(traceroute, "-I", framework.APIAddress())
|
|
out, err := cmd.Output()
|
|
if len(out) != 0 {
|
|
framework.Logf(string(out))
|
|
}
|
|
if exiterr, ok := err.(*exec.ExitError); err != nil && ok {
|
|
framework.Logf("Error while running traceroute: %s", exiterr.Stderr)
|
|
}
|
|
}
|
|
|
|
// 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 {
|
|
traceRouteToControlPlane()
|
|
return false, nil
|
|
}
|
|
return true, nil
|
|
})
|
|
if waitErr != nil {
|
|
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("control plane had kube-apiserver version %s which does not start with %s", got, want)
|
|
}
|
|
framework.Logf("Control plane is at version %s", want)
|
|
return nil
|
|
}
|
|
|
|
// nodeUpgrade upgrades nodes on GCE/GKE.
|
|
func nodeUpgrade(f *framework.Framework, v string, img string, extraEnvs []string) error {
|
|
// Perform the upgrade.
|
|
var err error
|
|
switch framework.TestContext.Provider {
|
|
case "gce":
|
|
err = nodeUpgradeGCE(v, img, extraEnvs)
|
|
case "gke":
|
|
err = nodeUpgradeGKE(f.Namespace.Name, v, img)
|
|
default:
|
|
err = fmt.Errorf("nodeUpgrade() is not implemented for provider %s", framework.TestContext.Provider)
|
|
}
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return waitForNodesReadyAfterUpgrade(f)
|
|
}
|
|
|
|
// TODO(mrhohn): Remove 'enableKubeProxyDaemonSet' when kube-proxy is run as a DaemonSet by default.
|
|
func nodeUpgradeGCE(rawV, img string, extraEnvs []string) error {
|
|
v := "v" + rawV
|
|
env := append(os.Environ(), extraEnvs...)
|
|
if img != "" {
|
|
env = append(env, "KUBE_NODE_OS_DISTRIBUTION="+img)
|
|
_, _, err := framework.RunCmdEnv(env, e2eproviders.GCEUpgradeScript(), "-N", "-o", v)
|
|
return err
|
|
}
|
|
_, _, err := framework.RunCmdEnv(env, e2eproviders.GCEUpgradeScript(), "-N", v)
|
|
return err
|
|
}
|
|
|
|
func nodeUpgradeGKE(namespace string, v string, img string) error {
|
|
framework.Logf("Upgrading nodes to version %q and image %q", v, img)
|
|
nps, err := nodePoolsGKE()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
framework.Logf("Found node pools %v", nps)
|
|
for _, np := range nps {
|
|
args := []string{
|
|
"container",
|
|
"clusters",
|
|
fmt.Sprintf("--project=%s", framework.TestContext.CloudConfig.ProjectID),
|
|
e2eproviders.LocationParamGKE(),
|
|
"upgrade",
|
|
framework.TestContext.CloudConfig.Cluster,
|
|
fmt.Sprintf("--node-pool=%s", np),
|
|
fmt.Sprintf("--cluster-version=%s", v),
|
|
"--quiet",
|
|
}
|
|
if len(img) > 0 {
|
|
args = append(args, fmt.Sprintf("--image-type=%s", img))
|
|
}
|
|
_, _, err = framework.RunCmd("gcloud", framework.AppendContainerCommandGroupIfNeeded(args)...)
|
|
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
e2enode.WaitForSSHTunnels(namespace)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func nodePoolsGKE() ([]string, error) {
|
|
args := []string{
|
|
"container",
|
|
"node-pools",
|
|
fmt.Sprintf("--project=%s", framework.TestContext.CloudConfig.ProjectID),
|
|
e2eproviders.LocationParamGKE(),
|
|
"list",
|
|
fmt.Sprintf("--cluster=%s", framework.TestContext.CloudConfig.Cluster),
|
|
"--format=get(name)",
|
|
}
|
|
stdout, _, err := framework.RunCmd("gcloud", framework.AppendContainerCommandGroupIfNeeded(args)...)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
if len(strings.TrimSpace(stdout)) == 0 {
|
|
return []string{}, nil
|
|
}
|
|
return strings.Fields(stdout), nil
|
|
}
|
|
|
|
func waitForNodesReadyAfterUpgrade(f *framework.Framework) error {
|
|
// Wait for it to complete and validate nodes are healthy.
|
|
//
|
|
// TODO(ihmccreery) We shouldn't have to wait for nodes to be ready in
|
|
// GKE; the operation shouldn't return until they all are.
|
|
numNodes, err := e2enode.TotalRegistered(f.ClientSet)
|
|
if err != nil {
|
|
return fmt.Errorf("couldn't detect number of nodes")
|
|
}
|
|
framework.Logf("Waiting up to %v for all %d nodes to be ready after the upgrade", framework.RestartNodeReadyAgainTimeout, numNodes)
|
|
if _, err := e2enode.CheckReady(f.ClientSet, numNodes, framework.RestartNodeReadyAgainTimeout); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// checkNodesVersions validates the nodes versions
|
|
func checkNodesVersions(cs clientset.Interface, want string) error {
|
|
l, err := e2enode.GetReadySchedulableNodes(cs)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
for _, n := range l.Items {
|
|
// We do prefix trimming and then matching because:
|
|
// want looks like: 0.19.3-815-g50e67d4
|
|
// kv/kvp look like: v0.19.3-815-g50e67d4034e858-dirty
|
|
kv, kpv := strings.TrimPrefix(n.Status.NodeInfo.KubeletVersion, "v"),
|
|
strings.TrimPrefix(n.Status.NodeInfo.KubeProxyVersion, "v")
|
|
if !strings.HasPrefix(kv, want) {
|
|
return fmt.Errorf("node %s had kubelet version %s which does not start with %s",
|
|
n.ObjectMeta.Name, kv, want)
|
|
}
|
|
if !strings.HasPrefix(kpv, want) {
|
|
return fmt.Errorf("node %s had kube-proxy version %s which does not start with %s",
|
|
n.ObjectMeta.Name, kpv, want)
|
|
}
|
|
}
|
|
return nil
|
|
}
|