github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #37286 from jszczepkowski/ha-e2e-onerepl 

Automatic merge from submit-queue

E2E tests cleanup: regexp for master replica in a separate function
pull/6/head
Kubernetes Submit Queue 2016-11-22 09:59:38 -08:00 committed by GitHub
parent 580c52be38 69dc4b0fc5
commit a9b58213b1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/framework/util.go
View File

@ -4011,6 +4011,10 @@ func WaitForClusterSize(c clientset.Interface, size int, timeout time.Duration)
return fmt.Errorf("timeout waiting %v for cluster size to be %d", timeout, size)
}
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) {
@ -4022,7 +4026,7 @@ func WaitForMasters(masterPrefix string, c clientset.Interface, size int, timeou
// Filter out nodes that are not master replicas
FilterNodes(nodes, func(node api.Node) bool {
res, err := regexp.Match(masterPrefix+"(-...)?", ([]byte)(node.Name))
res, err := regexp.Match(GenerateMasterRegexp(masterPrefix), ([]byte)(node.Name))
if err != nil {
Logf("Failed to match regexp to node name: %v", err)
return false

2
test/e2e/ha_master.go
View File

@ -64,7 +64,7 @@ func createNewRC(c clientset.Interface, ns string, name string) {
func verifyNumberOfMasterReplicas(expected int) {
output, err := exec.Command("gcloud", "compute", "instances", "list",
"--project="+framework.TestContext.CloudConfig.ProjectID,
"--regexp="+framework.TestContext.CloudConfig.MasterName+"(-...)?",
"--regexp="+framework.GenerateMasterRegexp(framework.TestContext.CloudConfig.MasterName),
"--filter=status=RUNNING",
"--format=[no-heading]").CombinedOutput()
framework.Logf("%s", output)