scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26957 from jszczepkowski/kac-tests-cleanup

Browse Source 
Added extra logging to cluster autoscaler e2e tests.
This commit is contained in:
Piotr Szczesniak
2016-06-08 11:06:18 +02:00
parent 878c8d41f1 95a59734de
commit 1d128614bc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/cluster_size_autoscaling.go
View File

@@ -87,6 +87,7 @@ var _ = framework.KubeDescribe("Cluster size autoscaling [Slow]", func() {
}) })
AfterEach(func() { AfterEach(func() {
By(fmt.Sprintf("Restoring initial size of the cluster"))
setMigSizes(originalSizes) setMigSizes(originalSizes)
framework.ExpectNoError(framework.WaitForClusterSize(c, nodeCount, scaleDownTimeout)) framework.ExpectNoError(framework.WaitForClusterSize(c, nodeCount, scaleDownTimeout))
}) })
@@ -173,11 +174,11 @@ var _ = framework.KubeDescribe("Cluster size autoscaling [Slow]", func() {
} }
} }
By(fmt.Sprintf("Annotating nodes of the smallest MIG: %s", minMig))
nodes, err := GetGroupNodes(minMig) nodes, err := GetGroupNodes(minMig)
defer removeLabels(nodes) defer removeLabels(nodes)
nodesMap := map[string]struct{}{} nodesMap := map[string]struct{}{}
ExpectNoError(err) ExpectNoError(err)
By(fmt.Sprintf("Annotating nodes of the smallest MIG(%s): %v", minMig, nodes))
for _, node := range nodes { for _, node := range nodes {
updateLabelsForNode(f, node, labels, nil) updateLabelsForNode(f, node, labels, nil)
nodesMap[node] = struct{}{} nodesMap[node] = struct{}{}
@@ -191,11 +192,10 @@ var _ = framework.KubeDescribe("Cluster size autoscaling [Slow]", func() {
framework.ExpectNoError(WaitForClusterSizeFunc(f.Client, framework.ExpectNoError(WaitForClusterSizeFunc(f.Client,
func(size int) bool { return size >= nodeCount+1 }, scaleUpTimeout)) func(size int) bool { return size >= nodeCount+1 }, scaleUpTimeout))
By("Setting labels for new nodes")
newNodes, err := GetGroupNodes(minMig) newNodes, err := GetGroupNodes(minMig)
defer removeLabels(newNodes) defer removeLabels(newNodes)
ExpectNoError(err) ExpectNoError(err)
By(fmt.Sprintf("Setting labels for new nodes: %v", newNodes))
for _, node := range newNodes { for _, node := range newNodes {
if _, old := nodesMap[node]; !old { if _, old := nodesMap[node]; !old {
updateLabelsForNode(f, node, labels, nil) updateLabelsForNode(f, node, labels, nil)
@@ -383,7 +383,6 @@ func WaitForClusterSizeFunc(c *client.Client, sizeFunc func(int) bool, timeout t
} }
func setMigSizes(sizes map[string]int) { func setMigSizes(sizes map[string]int) {
By(fmt.Sprintf("Restoring initial size of the cluster"))
for mig, desiredSize := range sizes { for mig, desiredSize := range sizes {
currentSize, err := GroupSize(mig) currentSize, err := GroupSize(mig)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@@ -406,4 +405,5 @@ func updateLabelsForNode(f *framework.Framework, node string, addLabels map[stri
} }
_, err = f.Client.Nodes().Update(n) _, err = f.Client.Nodes().Update(n)
ExpectNoError(err) ExpectNoError(err)
By(fmt.Sprintf("Labels successfully updated for node %s", node))
} }