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

Merge pull request #39739 from jszczepkowski/ha-e2e-tests

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 39773, 39739)

Fixed cluster validation in e2e tests for HA master.
This commit is contained in:
Kubernetes Submit Queue 2017-01-12 04:38:47 -08:00 committed by GitHub
commit 199af05cd0
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/e2e/ha_master.go
View File

@ -17,7 +17,6 @@ limitations under the License.
package e2e package e2e
import ( import (
"bytes"
"fmt" "fmt"
"os/exec" "os/exec"
"path" "path"
@ -81,22 +80,6 @@ func createNewRC(c clientset.Interface, ns string, name string) {
framework.ExpectNoError(err) framework.ExpectNoError(err)
} }
func verifyNumberOfMasterReplicas(expected int) {
output, err := exec.Command("gcloud", "compute", "instances", "list",
"--project="+framework.TestContext.CloudConfig.ProjectID,
"--regexp="+framework.GenerateMasterRegexp(framework.TestContext.CloudConfig.MasterName),
"--filter=status=RUNNING",
"--format=[no-heading]").CombinedOutput()
framework.Logf("%s", output)
framework.ExpectNoError(err)
newline := []byte("\n")
replicas := bytes.Count(output, newline)
framework.Logf("Num master replicas/expected: %d/%d", replicas, expected)
if replicas != expected {
framework.Failf("Wrong number of master replicas %d expected %d", replicas, expected)
}
}
func findRegionForZone(zone string) string { func findRegionForZone(zone string) string {
region, err := exec.Command("gcloud", "compute", "zones", "list", zone, "--quiet", "--format=[no-heading](region)").CombinedOutput() region, err := exec.Command("gcloud", "compute", "zones", "list", zone, "--quiet", "--format=[no-heading](region)").CombinedOutput()
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -142,7 +125,7 @@ var _ = framework.KubeDescribe("HA-master [Feature:HAMaster]", func() {
framework.SkipUnlessProviderIs("gce") framework.SkipUnlessProviderIs("gce")
c = f.ClientSet c = f.ClientSet
ns = f.Namespace.Name ns = f.Namespace.Name
verifyNumberOfMasterReplicas(1) framework.ExpectNoError(framework.WaitForMasters(framework.TestContext.CloudConfig.MasterName, c, 1, 10*time.Minute))
additionalReplicaZones = make([]string, 0) additionalReplicaZones = make([]string, 0)
existingRCs = make([]string, 0) existingRCs = make([]string, 0)
}) })
@ -152,13 +135,13 @@ var _ = framework.KubeDescribe("HA-master [Feature:HAMaster]", func() {
for _, zone := range additionalNodesZones { for _, zone := range additionalNodesZones {
removeWorkerNodes(zone) removeWorkerNodes(zone)
} }
framework.ExpectNoError(framework.AllNodesReady(c, 5*time.Minute))
// Clean-up additional master replicas if the test execution was broken. // Clean-up additional master replicas if the test execution was broken.
for _, zone := range additionalReplicaZones { for _, zone := range additionalReplicaZones {
removeMasterReplica(zone) removeMasterReplica(zone)
} }
framework.WaitForMasters(framework.TestContext.CloudConfig.MasterName, c, 1, 10*time.Minute) framework.ExpectNoError(framework.WaitForMasters(framework.TestContext.CloudConfig.MasterName, c, 1, 10*time.Minute))
verifyNumberOfMasterReplicas(1)
}) })
type Action int type Action int
@ -186,9 +169,8 @@ var _ = framework.KubeDescribe("HA-master [Feature:HAMaster]", func() {
framework.ExpectNoError(removeWorkerNodes(zone)) framework.ExpectNoError(removeWorkerNodes(zone))
additionalNodesZones = removeZoneFromZones(additionalNodesZones, zone) additionalNodesZones = removeZoneFromZones(additionalNodesZones, zone)
} }
verifyNumberOfMasterReplicas(len(additionalReplicaZones) + 1) framework.ExpectNoError(framework.WaitForMasters(framework.TestContext.CloudConfig.MasterName, c, len(additionalReplicaZones)+1, 10*time.Minute))
framework.WaitForMasters(framework.TestContext.CloudConfig.MasterName, c, len(additionalReplicaZones)+1, 10*time.Minute) framework.ExpectNoError(framework.AllNodesReady(c, 5*time.Minute))
framework.AllNodesReady(c, 5*time.Minute)
// Verify that API server works correctly with HA master. // Verify that API server works correctly with HA master.
rcName := "ha-master-" + strconv.Itoa(len(existingRCs)) rcName := "ha-master-" + strconv.Itoa(len(existingRCs))