
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
293 lines
9.3 KiB
Go
293 lines
9.3 KiB
Go
/*
|
|
Copyright 2015 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 gcp
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os/exec"
|
|
"path"
|
|
"regexp"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/onsi/ginkgo/v2"
|
|
v1 "k8s.io/api/core/v1"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
clientset "k8s.io/client-go/kubernetes"
|
|
"k8s.io/kubernetes/test/e2e/common"
|
|
"k8s.io/kubernetes/test/e2e/framework"
|
|
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
|
|
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
|
|
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
|
|
admissionapi "k8s.io/pod-security-admission/api"
|
|
)
|
|
|
|
func addMasterReplica(zone string) error {
|
|
framework.Logf(fmt.Sprintf("Adding a new master replica, zone: %s", zone))
|
|
_, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/e2e-internal/e2e-grow-cluster.sh"), zone, "true", "true", "false")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func removeMasterReplica(zone string) error {
|
|
framework.Logf(fmt.Sprintf("Removing an existing master replica, zone: %s", zone))
|
|
_, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/e2e-internal/e2e-shrink-cluster.sh"), zone, "true", "false", "false")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func addWorkerNodes(zone string) error {
|
|
framework.Logf(fmt.Sprintf("Adding worker nodes, zone: %s", zone))
|
|
_, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/e2e-internal/e2e-grow-cluster.sh"), zone, "true", "false", "true")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func removeWorkerNodes(zone string) error {
|
|
framework.Logf(fmt.Sprintf("Removing worker nodes, zone: %s", zone))
|
|
_, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/e2e-internal/e2e-shrink-cluster.sh"), zone, "true", "true", "true")
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func verifyRCs(c clientset.Interface, ns string, names []string) {
|
|
for _, name := range names {
|
|
framework.ExpectNoError(e2epod.VerifyPods(c, ns, name, true, 1))
|
|
}
|
|
}
|
|
|
|
func createNewRC(c clientset.Interface, ns string, name string) {
|
|
_, err := common.NewRCByName(c, ns, name, 1, nil, nil)
|
|
framework.ExpectNoError(err)
|
|
}
|
|
|
|
func findRegionForZone(zone string) string {
|
|
region, err := exec.Command("gcloud", "compute", "zones", "list", zone, "--quiet", "--format=csv[no-heading](region)").Output()
|
|
framework.ExpectNoError(err)
|
|
if string(region) == "" {
|
|
framework.Failf("Region not found; zone: %s", zone)
|
|
}
|
|
return string(region)
|
|
}
|
|
|
|
func findZonesForRegion(region string) []string {
|
|
output, err := exec.Command("gcloud", "compute", "zones", "list", "--filter=region="+region,
|
|
"--quiet", "--format=csv[no-heading](name)").Output()
|
|
framework.ExpectNoError(err)
|
|
zones := strings.Split(string(output), "\n")
|
|
return zones
|
|
}
|
|
|
|
// removeZoneFromZones removes zone from zones slide.
|
|
// Please note that entries in zones can be repeated. In such situation only one replica is removed.
|
|
func removeZoneFromZones(zones []string, zone string) []string {
|
|
idx := -1
|
|
for j, z := range zones {
|
|
if z == zone {
|
|
idx = j
|
|
break
|
|
}
|
|
}
|
|
if idx >= 0 {
|
|
return zones[:idx+copy(zones[idx:], zones[idx+1:])]
|
|
}
|
|
return zones
|
|
}
|
|
|
|
// generateMasterRegexp returns a regex for matching master node name.
|
|
func generateMasterRegexp(prefix string) string {
|
|
return prefix + "(-...)?"
|
|
}
|
|
|
|
// waitForMasters waits until the cluster has the desired number of ready masters in it.
|
|
func waitForMasters(masterPrefix string, c clientset.Interface, size int, timeout time.Duration) error {
|
|
for start := time.Now(); time.Since(start) < timeout; time.Sleep(20 * time.Second) {
|
|
nodes, err := c.CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
|
|
if err != nil {
|
|
framework.Logf("Failed to list nodes: %v", err)
|
|
continue
|
|
}
|
|
|
|
// Filter out nodes that are not master replicas
|
|
e2enode.Filter(nodes, func(node v1.Node) bool {
|
|
res, err := regexp.Match(generateMasterRegexp(masterPrefix), ([]byte)(node.Name))
|
|
if err != nil {
|
|
framework.Logf("Failed to match regexp to node name: %v", err)
|
|
return false
|
|
}
|
|
return res
|
|
})
|
|
|
|
numNodes := len(nodes.Items)
|
|
|
|
// Filter out not-ready nodes.
|
|
e2enode.Filter(nodes, func(node v1.Node) bool {
|
|
return e2enode.IsConditionSetAsExpected(&node, v1.NodeReady, true)
|
|
})
|
|
|
|
numReady := len(nodes.Items)
|
|
|
|
if numNodes == size && numReady == size {
|
|
framework.Logf("Cluster has reached the desired number of masters %d", size)
|
|
return nil
|
|
}
|
|
framework.Logf("Waiting for the number of masters %d, current %d, not ready master nodes %d", size, numNodes, numNodes-numReady)
|
|
}
|
|
return fmt.Errorf("timeout waiting %v for the number of masters to be %d", timeout, size)
|
|
}
|
|
|
|
var _ = SIGDescribe("HA-master [Feature:HAMaster]", func() {
|
|
f := framework.NewDefaultFramework("ha-master")
|
|
f.NamespacePodSecurityEnforceLevel = admissionapi.LevelPrivileged
|
|
var c clientset.Interface
|
|
var ns string
|
|
var additionalReplicaZones []string
|
|
var additionalNodesZones []string
|
|
var existingRCs []string
|
|
|
|
ginkgo.BeforeEach(func() {
|
|
e2eskipper.SkipUnlessProviderIs("gce")
|
|
c = f.ClientSet
|
|
ns = f.Namespace.Name
|
|
framework.ExpectNoError(waitForMasters(framework.TestContext.CloudConfig.MasterName, c, 1, 10*time.Minute))
|
|
additionalReplicaZones = make([]string, 0)
|
|
existingRCs = make([]string, 0)
|
|
})
|
|
|
|
ginkgo.AfterEach(func() {
|
|
// Clean-up additional worker nodes if the test execution was broken.
|
|
for _, zone := range additionalNodesZones {
|
|
removeWorkerNodes(zone)
|
|
}
|
|
framework.ExpectNoError(e2enode.AllNodesReady(c, 5*time.Minute))
|
|
|
|
// Clean-up additional master replicas if the test execution was broken.
|
|
for _, zone := range additionalReplicaZones {
|
|
removeMasterReplica(zone)
|
|
}
|
|
framework.ExpectNoError(waitForMasters(framework.TestContext.CloudConfig.MasterName, c, 1, 10*time.Minute))
|
|
})
|
|
|
|
type Action int
|
|
const (
|
|
None Action = iota
|
|
AddReplica
|
|
RemoveReplica
|
|
AddNodes
|
|
RemoveNodes
|
|
)
|
|
|
|
step := func(action Action, zone string) {
|
|
switch action {
|
|
case None:
|
|
case AddReplica:
|
|
framework.ExpectNoError(addMasterReplica(zone))
|
|
additionalReplicaZones = append(additionalReplicaZones, zone)
|
|
case RemoveReplica:
|
|
framework.ExpectNoError(removeMasterReplica(zone))
|
|
additionalReplicaZones = removeZoneFromZones(additionalReplicaZones, zone)
|
|
case AddNodes:
|
|
framework.ExpectNoError(addWorkerNodes(zone))
|
|
additionalNodesZones = append(additionalNodesZones, zone)
|
|
case RemoveNodes:
|
|
framework.ExpectNoError(removeWorkerNodes(zone))
|
|
additionalNodesZones = removeZoneFromZones(additionalNodesZones, zone)
|
|
}
|
|
framework.ExpectNoError(waitForMasters(framework.TestContext.CloudConfig.MasterName, c, len(additionalReplicaZones)+1, 10*time.Minute))
|
|
framework.ExpectNoError(e2enode.AllNodesReady(c, 5*time.Minute))
|
|
|
|
// Verify that API server works correctly with HA master.
|
|
rcName := "ha-master-" + strconv.Itoa(len(existingRCs))
|
|
createNewRC(c, ns, rcName)
|
|
existingRCs = append(existingRCs, rcName)
|
|
verifyRCs(c, ns, existingRCs)
|
|
}
|
|
|
|
ginkgo.It("survive addition/removal replicas same zone [Serial][Disruptive]", func() {
|
|
zone := framework.TestContext.CloudConfig.Zone
|
|
step(None, "")
|
|
numAdditionalReplicas := 2
|
|
for i := 0; i < numAdditionalReplicas; i++ {
|
|
step(AddReplica, zone)
|
|
}
|
|
for i := 0; i < numAdditionalReplicas; i++ {
|
|
step(RemoveReplica, zone)
|
|
}
|
|
})
|
|
|
|
ginkgo.It("survive addition/removal replicas different zones [Serial][Disruptive]", func() {
|
|
zone := framework.TestContext.CloudConfig.Zone
|
|
region := findRegionForZone(zone)
|
|
zones := findZonesForRegion(region)
|
|
zones = removeZoneFromZones(zones, zone)
|
|
|
|
step(None, "")
|
|
// If numAdditionalReplicas is larger then the number of remaining zones in the region,
|
|
// we create a few masters in the same zone and zone entry is repeated in additionalReplicaZones.
|
|
numAdditionalReplicas := 2
|
|
for i := 0; i < numAdditionalReplicas; i++ {
|
|
step(AddReplica, zones[i%len(zones)])
|
|
}
|
|
for i := 0; i < numAdditionalReplicas; i++ {
|
|
step(RemoveReplica, zones[i%len(zones)])
|
|
}
|
|
})
|
|
|
|
ginkgo.It("survive addition/removal replicas multizone workers [Serial][Disruptive]", func() {
|
|
zone := framework.TestContext.CloudConfig.Zone
|
|
region := findRegionForZone(zone)
|
|
zones := findZonesForRegion(region)
|
|
zones = removeZoneFromZones(zones, zone)
|
|
|
|
step(None, "")
|
|
numAdditionalReplicas := 2
|
|
|
|
// Add worker nodes.
|
|
for i := 0; i < numAdditionalReplicas && i < len(zones); i++ {
|
|
step(AddNodes, zones[i])
|
|
}
|
|
|
|
// Add master repilcas.
|
|
//
|
|
// If numAdditionalReplicas is larger then the number of remaining zones in the region,
|
|
// we create a few masters in the same zone and zone entry is repeated in additionalReplicaZones.
|
|
for i := 0; i < numAdditionalReplicas; i++ {
|
|
step(AddReplica, zones[i%len(zones)])
|
|
}
|
|
|
|
// Remove master repilcas.
|
|
for i := 0; i < numAdditionalReplicas; i++ {
|
|
step(RemoveReplica, zones[i%len(zones)])
|
|
}
|
|
|
|
// Remove worker nodes.
|
|
for i := 0; i < numAdditionalReplicas && i < len(zones); i++ {
|
|
step(RemoveNodes, zones[i])
|
|
}
|
|
})
|
|
})
|