github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 22:17:14 +00:00
Code Issues Projects Releases Wiki Activity

Autoscaler e2e - fix getting initial pool size

Browse Source
This commit is contained in:
Beata Skiba 2018-02-23 09:38:55 +01:00
parent 064597a8e0
commit 1d22cb5d6a
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/autoscaling/cluster_size_autoscaling.go
View File

@ -1290,7 +1290,6 @@ func waitTillAllNAPNodePoolsAreRemoved() error {
return err return err
} }
// Returns size of the newly added node pool
func addNodePool(name string, machineType string, numNodes int) { func addNodePool(name string, machineType string, numNodes int) {
args := []string{"container", "node-pools", "create", name, "--quiet", args := []string{"container", "node-pools", "create", name, "--quiet",
"--machine-type=" + machineType, "--machine-type=" + machineType,
@ -1298,7 +1297,7 @@ func addNodePool(name string, machineType string, numNodes int) {
"--cluster=" + framework.TestContext.CloudConfig.Cluster} "--cluster=" + framework.TestContext.CloudConfig.Cluster}
output, err := execCmd(getGcloudCommand(args)...).CombinedOutput() output, err := execCmd(getGcloudCommand(args)...).CombinedOutput()
glog.Infof("Creating node-pool %s: %s", name, output) glog.Infof("Creating node-pool %s: %s", name, output)
framework.ExpectNoError(err, output) framework.ExpectNoError(err, string(output))
} }
func deleteNodePool(name string) { func deleteNodePool(name string) {
@ -1330,10 +1329,10 @@ func getPoolInitialSize(poolName string) int {
// get initial node count // get initial node count
args := []string{"container", "node-pools", "describe", poolName, "--quiet", args := []string{"container", "node-pools", "describe", poolName, "--quiet",
"--cluster=" + framework.TestContext.CloudConfig.Cluster, "--cluster=" + framework.TestContext.CloudConfig.Cluster,
"--format=\"value(initialNodeCount)\""} "--format=value(initialNodeCount)"}
output, err := execCmd(getGcloudCommand(args)...).CombinedOutput() output, err := execCmd(getGcloudCommand(args)...).CombinedOutput()
glog.Infof("Node-pool initial size: %s", output) glog.Infof("Node-pool initial size: %s", output)
framework.ExpectNoError(err) framework.ExpectNoError(err, string(output))
fields := strings.Fields(string(output)) fields := strings.Fields(string(output))
Expect(len(fields)).Should(Equal(1)) Expect(len(fields)).Should(Equal(1))
size, err := strconv.ParseInt(fields[0], 10, 64) size, err := strconv.ParseInt(fields[0], 10, 64)
@ -1342,9 +1341,9 @@ func getPoolInitialSize(poolName string) int {
// get number of node pools // get number of node pools
args = []string{"container", "node-pools", "describe", poolName, "--quiet", args = []string{"container", "node-pools", "describe", poolName, "--quiet",
"--cluster=" + framework.TestContext.CloudConfig.Cluster, "--cluster=" + framework.TestContext.CloudConfig.Cluster,
"--format=\"value(instanceGroupUrls)\""} "--format=value(instanceGroupUrls)"}
output, err = execCmd(getGcloudCommand(args)...).CombinedOutput() output, err = execCmd(getGcloudCommand(args)...).CombinedOutput()
framework.ExpectNoError(err) framework.ExpectNoError(err, string(output))
nodeGroupCount := len(strings.Split(string(output), ";")) nodeGroupCount := len(strings.Split(string(output), ";"))
return int(size) * nodeGroupCount return int(size) * nodeGroupCount
} }