Skip to content

Commit ad5e57b

Browse files
author
s-ito-ts
committed
Use framework.ExpectNoError() for e2e/autoscaling
1 parent 47c0340 commit ad5e57b

File tree

1 file changed

+40
-27
lines changed

1 file changed

+40
-27
lines changed

‎test/e2e/autoscaling/dns_autoscaling.go‎

Lines changed: 40 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ var _ = SIGDescribe("DNS horizontal autoscaling", func() {
6060
By("Collecting original replicas count and DNS scaling params")
6161
var err error
6262
originDNSReplicasCount, err = getDNSReplicas(c)
63-
Expect(err).NotTo(HaveOccurred())
63+
framework.ExpectNoError(err)
6464

6565
pcm, err := fetchDNSScalingConfigMap(c)
66-
Expect(err).NotTo(HaveOccurred())
66+
framework.ExpectNoError(err)
6767
previousParams = pcm.Data
6868

6969
if nodeCount <= 500 {
@@ -100,28 +100,30 @@ var _ = SIGDescribe("DNS horizontal autoscaling", func() {
100100
// Will take around 5 minutes to run on a 4 nodes cluster.
101101
It("[Serial] [Slow] kube-dns-autoscaler should scale kube-dns pods when cluster size changed", func() {
102102
numNodes, err := framework.NumberOfRegisteredNodes(c)
103-
Expect(err).NotTo(HaveOccurred())
103+
framework.ExpectNoError(err)
104104

105105
By("Replace the dns autoscaling parameters with testing parameters")
106106
err = updateDNSScalingConfigMap(c, packDNSScalingConfigMap(packLinearParams(&DNSParams_1)))
107-
Expect(err).NotTo(HaveOccurred())
107+
framework.ExpectNoError(err)
108108
defer func() {
109109
By("Restoring initial dns autoscaling parameters")
110-
Expect(updateDNSScalingConfigMap(c, packDNSScalingConfigMap(previousParams))).NotTo(HaveOccurred())
110+
err = updateDNSScalingConfigMap(c, packDNSScalingConfigMap(previousParams))
111+
framework.ExpectNoError(err)
111112

112113
By("Wait for number of running and ready kube-dns pods recover")
113114
label := labels.SelectorFromSet(labels.Set(map[string]string{ClusterAddonLabelKey: DNSLabelName}))
114115
_, err := framework.WaitForPodsWithLabelRunningReady(c, metav1.NamespaceSystem, label, originDNSReplicasCount, DNSdefaultTimeout)
115-
Expect(err).NotTo(HaveOccurred())
116+
framework.ExpectNoError(err)
116117
}()
117118
By("Wait for kube-dns scaled to expected number")
118119
getExpectReplicasLinear := getExpectReplicasFuncLinear(c, &DNSParams_1)
119-
Expect(waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)).NotTo(HaveOccurred())
120+
err = waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)
121+
framework.ExpectNoError(err)
120122

121123
originalSizes := make(map[string]int)
122124
for _, mig := range strings.Split(framework.TestContext.CloudConfig.NodeInstanceGroup, ",") {
123125
size, err := framework.GroupSize(mig)
124-
Expect(err).NotTo(HaveOccurred())
126+
framework.ExpectNoError(err)
125127
By(fmt.Sprintf("Initial size of %s: %d", mig, size))
126128
originalSizes[mig] = size
127129
}
@@ -132,77 +134,88 @@ var _ = SIGDescribe("DNS horizontal autoscaling", func() {
132134
increasedSizes[key] = val + 1
133135
}
134136
setMigSizes(increasedSizes)
135-
Expect(WaitForClusterSizeFunc(c,
136-
func(size int) bool { return size == numNodes+len(originalSizes) }, scaleUpTimeout)).NotTo(HaveOccurred())
137+
err = WaitForClusterSizeFunc(c,
138+
func(size int) bool { return size == numNodes+len(originalSizes) }, scaleUpTimeout)
139+
framework.ExpectNoError(err)
137140

138141
By("Wait for kube-dns scaled to expected number")
139142
getExpectReplicasLinear = getExpectReplicasFuncLinear(c, &DNSParams_1)
140-
Expect(waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)).NotTo(HaveOccurred())
143+
err = waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)
144+
framework.ExpectNoError(err)
141145

142146
By("Replace the dns autoscaling parameters with another testing parameters")
143147
err = updateDNSScalingConfigMap(c, packDNSScalingConfigMap(packLinearParams(&DNSParams_3)))
144-
Expect(err).NotTo(HaveOccurred())
148+
framework.ExpectNoError(err)
145149

146150
By("Wait for kube-dns scaled to expected number")
147151
getExpectReplicasLinear = getExpectReplicasFuncLinear(c, &DNSParams_3)
148-
Expect(waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)).NotTo(HaveOccurred())
152+
err = waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)
153+
framework.ExpectNoError(err)
149154

150155
By("Restoring cluster size")
151156
setMigSizes(originalSizes)
152-
Expect(framework.WaitForReadyNodes(c, numNodes, scaleDownTimeout)).NotTo(HaveOccurred())
157+
err = framework.WaitForReadyNodes(c, numNodes, scaleDownTimeout)
158+
framework.ExpectNoError(err)
153159

154160
By("Wait for kube-dns scaled to expected number")
155-
Expect(waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)).NotTo(HaveOccurred())
161+
err = waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)
162+
framework.ExpectNoError(err)
156163
})
157164

158165
// TODO: Get rid of [DisabledForLargeClusters] tag when issue #55779 is fixed.
159166
It("[DisabledForLargeClusters] kube-dns-autoscaler should scale kube-dns pods in both nonfaulty and faulty scenarios", func() {
160167

161168
By("Replace the dns autoscaling parameters with testing parameters")
162169
err := updateDNSScalingConfigMap(c, packDNSScalingConfigMap(packLinearParams(&DNSParams_1)))
163-
Expect(err).NotTo(HaveOccurred())
170+
framework.ExpectNoError(err)
164171
defer func() {
165172
By("Restoring initial dns autoscaling parameters")
166-
Expect(updateDNSScalingConfigMap(c, packDNSScalingConfigMap(previousParams))).NotTo(HaveOccurred())
173+
err = updateDNSScalingConfigMap(c, packDNSScalingConfigMap(previousParams))
174+
framework.ExpectNoError(err)
167175
}()
168176
By("Wait for kube-dns scaled to expected number")
169177
getExpectReplicasLinear := getExpectReplicasFuncLinear(c, &DNSParams_1)
170-
Expect(waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)).NotTo(HaveOccurred())
178+
err = waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)
179+
framework.ExpectNoError(err)
171180

172181
By("--- Scenario: should scale kube-dns based on changed parameters ---")
173182
By("Replace the dns autoscaling parameters with another testing parameters")
174183
err = updateDNSScalingConfigMap(c, packDNSScalingConfigMap(packLinearParams(&DNSParams_3)))
175-
Expect(err).NotTo(HaveOccurred())
184+
framework.ExpectNoError(err)
176185
By("Wait for kube-dns scaled to expected number")
177186
getExpectReplicasLinear = getExpectReplicasFuncLinear(c, &DNSParams_3)
178-
Expect(waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)).NotTo(HaveOccurred())
187+
err = waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)
188+
framework.ExpectNoError(err)
179189

180190
By("--- Scenario: should re-create scaling parameters with default value when parameters got deleted ---")
181191
By("Delete the ConfigMap for autoscaler")
182192
err = deleteDNSScalingConfigMap(c)
183-
Expect(err).NotTo(HaveOccurred())
193+
framework.ExpectNoError(err)
184194

185195
By("Wait for the ConfigMap got re-created")
186196
_, err = waitForDNSConfigMapCreated(c, DNSdefaultTimeout)
187-
Expect(err).NotTo(HaveOccurred())
197+
framework.ExpectNoError(err)
188198

189199
By("Replace the dns autoscaling parameters with another testing parameters")
190200
err = updateDNSScalingConfigMap(c, packDNSScalingConfigMap(packLinearParams(&DNSParams_2)))
191-
Expect(err).NotTo(HaveOccurred())
201+
framework.ExpectNoError(err)
192202
By("Wait for kube-dns scaled to expected number")
193203
getExpectReplicasLinear = getExpectReplicasFuncLinear(c, &DNSParams_2)
194-
Expect(waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)).NotTo(HaveOccurred())
204+
err = waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)
205+
framework.ExpectNoError(err)
195206

196207
By("--- Scenario: should recover after autoscaler pod got deleted ---")
197208
By("Delete the autoscaler pod for kube-dns")
198-
Expect(deleteDNSAutoscalerPod(c)).NotTo(HaveOccurred())
209+
err = deleteDNSAutoscalerPod(c)
210+
framework.ExpectNoError(err)
199211

200212
By("Replace the dns autoscaling parameters with another testing parameters")
201213
err = updateDNSScalingConfigMap(c, packDNSScalingConfigMap(packLinearParams(&DNSParams_1)))
202-
Expect(err).NotTo(HaveOccurred())
214+
framework.ExpectNoError(err)
203215
By("Wait for kube-dns scaled to expected number")
204216
getExpectReplicasLinear = getExpectReplicasFuncLinear(c, &DNSParams_1)
205-
Expect(waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)).NotTo(HaveOccurred())
217+
err = waitForDNSReplicasSatisfied(c, getExpectReplicasLinear, DNSdefaultTimeout)
218+
framework.ExpectNoError(err)
206219
})
207220
})
208221

0 commit comments

Comments
 (0)