Skip to content

Commit e3ebfaf

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #4141 from mogsie/complete-e2e-gomega-cleanup
✨ (go/v4): cleanup: in e2e/test.go, make Gomega assertions more concise
2 parents a426ae0 + 75e19b0 commit e3ebfaf

File tree

8 files changed

+40
-96
lines changed

8 files changed

+40
-96
lines changed

‎docs/book/src/cronjob-tutorial/testdata/project/test/e2e/e2e_test.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,15 @@ var _ = Describe("Manager", Ordered, func() {
122122
"--clusterrole=project-metrics-reader",
123123
fmt.Sprintf("--serviceaccount=%s:%s", namespace, serviceAccountName),
124124
)
125-
_, err := utils.Run(cmd)
126-
Expect(err).NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
125+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
127126

128127
By("validating that the metrics service is available")
129128
cmd = exec.Command("kubectl", "get", "service", metricsServiceName, "-n", namespace)
130-
_, err = utils.Run(cmd)
131-
Expect(err).NotTo(HaveOccurred(), "Metrics service should exist")
129+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Metrics service should exist")
132130

133131
By("validating that the ServiceMonitor for Prometheus is applied in the namespace")
134132
cmd = exec.Command("kubectl", "get", "ServiceMonitor", "-n", namespace)
135-
_, err = utils.Run(cmd)
136-
Expect(err).NotTo(HaveOccurred(), "ServiceMonitor should exist")
133+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "ServiceMonitor should exist")
137134

138135
By("getting the service account token")
139136
token, err := serviceAccountToken()
@@ -143,18 +140,14 @@ var _ = Describe("Manager", Ordered, func() {
143140
By("waiting for the metrics endpoint to be ready")
144141
verifyMetricsEndpointReady := func(g Gomega) {
145142
cmd := exec.Command("kubectl", "get", "endpoints", metricsServiceName, "-n", namespace)
146-
output, err := utils.Run(cmd)
147-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve endpoints information")
148-
g.Expect(string(output)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
143+
g.Expect(utils.Run(cmd)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
149144
}
150145
Eventually(verifyMetricsEndpointReady).Should(Succeed())
151146

152147
By("verifying that the controller manager is serving the metrics server")
153148
verifyMetricsServerStarted := func(g Gomega) {
154149
cmd := exec.Command("kubectl", "logs", controllerPodName, "-n", namespace)
155-
logs, err := utils.Run(cmd)
156-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve controller manager logs")
157-
g.Expect(string(logs)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
150+
g.Expect(utils.Run(cmd)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
158151
"Metrics server not yet started")
159152
}
160153
Eventually(verifyMetricsServerStarted).Should(Succeed())

‎docs/book/src/getting-started/testdata/project/test/e2e/e2e_test.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,15 @@ var _ = Describe("Manager", Ordered, func() {
122122
"--clusterrole=project-metrics-reader",
123123
fmt.Sprintf("--serviceaccount=%s:%s", namespace, serviceAccountName),
124124
)
125-
_, err := utils.Run(cmd)
126-
Expect(err).NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
125+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
127126

128127
By("validating that the metrics service is available")
129128
cmd = exec.Command("kubectl", "get", "service", metricsServiceName, "-n", namespace)
130-
_, err = utils.Run(cmd)
131-
Expect(err).NotTo(HaveOccurred(), "Metrics service should exist")
129+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Metrics service should exist")
132130

133131
By("validating that the ServiceMonitor for Prometheus is applied in the namespace")
134132
cmd = exec.Command("kubectl", "get", "ServiceMonitor", "-n", namespace)
135-
_, err = utils.Run(cmd)
136-
Expect(err).NotTo(HaveOccurred(), "ServiceMonitor should exist")
133+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "ServiceMonitor should exist")
137134

138135
By("getting the service account token")
139136
token, err := serviceAccountToken()
@@ -143,18 +140,14 @@ var _ = Describe("Manager", Ordered, func() {
143140
By("waiting for the metrics endpoint to be ready")
144141
verifyMetricsEndpointReady := func(g Gomega) {
145142
cmd := exec.Command("kubectl", "get", "endpoints", metricsServiceName, "-n", namespace)
146-
output, err := utils.Run(cmd)
147-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve endpoints information")
148-
g.Expect(string(output)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
143+
g.Expect(utils.Run(cmd)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
149144
}
150145
Eventually(verifyMetricsEndpointReady).Should(Succeed())
151146

152147
By("verifying that the controller manager is serving the metrics server")
153148
verifyMetricsServerStarted := func(g Gomega) {
154149
cmd := exec.Command("kubectl", "logs", controllerPodName, "-n", namespace)
155-
logs, err := utils.Run(cmd)
156-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve controller manager logs")
157-
g.Expect(string(logs)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
150+
g.Expect(utils.Run(cmd)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
158151
"Metrics server not yet started")
159152
}
160153
Eventually(verifyMetricsServerStarted).Should(Succeed())

‎pkg/plugins/golang/v4/scaffolds/internal/templates/test/e2e/test.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -255,18 +255,15 @@ var _ = Describe("Manager", Ordered, func() {
255255
"--clusterrole={{ .ProjectName}}-metrics-reader",
256256
fmt.Sprintf("--serviceaccount=%s:%s", namespace, serviceAccountName),
257257
)
258-
_, err := utils.Run(cmd)
259-
Expect(err).NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
258+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
260259
261260
By("validating that the metrics service is available")
262261
cmd = exec.Command("kubectl", "get", "service", metricsServiceName, "-n", namespace)
263-
_, err = utils.Run(cmd)
264-
Expect(err).NotTo(HaveOccurred(), "Metrics service should exist")
262+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Metrics service should exist")
265263
266264
By("validating that the ServiceMonitor for Prometheus is applied in the namespace")
267265
cmd = exec.Command("kubectl", "get", "ServiceMonitor", "-n", namespace)
268-
_, err = utils.Run(cmd)
269-
Expect(err).NotTo(HaveOccurred(), "ServiceMonitor should exist")
266+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "ServiceMonitor should exist")
270267
271268
By("getting the service account token")
272269
token, err := serviceAccountToken()
@@ -276,18 +273,14 @@ var _ = Describe("Manager", Ordered, func() {
276273
By("waiting for the metrics endpoint to be ready")
277274
verifyMetricsEndpointReady := func(g Gomega) {
278275
cmd := exec.Command("kubectl", "get", "endpoints", metricsServiceName, "-n", namespace)
279-
output, err := utils.Run(cmd)
280-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve endpoints information")
281-
g.Expect(string(output)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
276+
g.Expect(utils.Run(cmd)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
282277
}
283278
Eventually(verifyMetricsEndpointReady).Should(Succeed())
284279
285280
By("verifying that the controller manager is serving the metrics server")
286281
verifyMetricsServerStarted := func(g Gomega) {
287282
cmd := exec.Command("kubectl", "logs", controllerPodName, "-n", namespace)
288-
logs, err := utils.Run(cmd)
289-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve controller manager logs")
290-
g.Expect(string(logs)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
283+
g.Expect(utils.Run(cmd)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
291284
"Metrics server not yet started")
292285
}
293286
Eventually(verifyMetricsServerStarted).Should(Succeed())

‎testdata/project-v4-multigroup-with-deploy-image/test/e2e/e2e_test.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,15 @@ var _ = Describe("Manager", Ordered, func() {
122122
"--clusterrole=project-v4-multigroup-with-deploy-image-metrics-reader",
123123
fmt.Sprintf("--serviceaccount=%s:%s", namespace, serviceAccountName),
124124
)
125-
_, err := utils.Run(cmd)
126-
Expect(err).NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
125+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
127126

128127
By("validating that the metrics service is available")
129128
cmd = exec.Command("kubectl", "get", "service", metricsServiceName, "-n", namespace)
130-
_, err = utils.Run(cmd)
131-
Expect(err).NotTo(HaveOccurred(), "Metrics service should exist")
129+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Metrics service should exist")
132130

133131
By("validating that the ServiceMonitor for Prometheus is applied in the namespace")
134132
cmd = exec.Command("kubectl", "get", "ServiceMonitor", "-n", namespace)
135-
_, err = utils.Run(cmd)
136-
Expect(err).NotTo(HaveOccurred(), "ServiceMonitor should exist")
133+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "ServiceMonitor should exist")
137134

138135
By("getting the service account token")
139136
token, err := serviceAccountToken()
@@ -143,18 +140,14 @@ var _ = Describe("Manager", Ordered, func() {
143140
By("waiting for the metrics endpoint to be ready")
144141
verifyMetricsEndpointReady := func(g Gomega) {
145142
cmd := exec.Command("kubectl", "get", "endpoints", metricsServiceName, "-n", namespace)
146-
output, err := utils.Run(cmd)
147-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve endpoints information")
148-
g.Expect(string(output)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
143+
g.Expect(utils.Run(cmd)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
149144
}
150145
Eventually(verifyMetricsEndpointReady).Should(Succeed())
151146

152147
By("verifying that the controller manager is serving the metrics server")
153148
verifyMetricsServerStarted := func(g Gomega) {
154149
cmd := exec.Command("kubectl", "logs", controllerPodName, "-n", namespace)
155-
logs, err := utils.Run(cmd)
156-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve controller manager logs")
157-
g.Expect(string(logs)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
150+
g.Expect(utils.Run(cmd)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
158151
"Metrics server not yet started")
159152
}
160153
Eventually(verifyMetricsServerStarted).Should(Succeed())

‎testdata/project-v4-multigroup/test/e2e/e2e_test.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,15 @@ var _ = Describe("Manager", Ordered, func() {
122122
"--clusterrole=project-v4-multigroup-metrics-reader",
123123
fmt.Sprintf("--serviceaccount=%s:%s", namespace, serviceAccountName),
124124
)
125-
_, err := utils.Run(cmd)
126-
Expect(err).NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
125+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
127126

128127
By("validating that the metrics service is available")
129128
cmd = exec.Command("kubectl", "get", "service", metricsServiceName, "-n", namespace)
130-
_, err = utils.Run(cmd)
131-
Expect(err).NotTo(HaveOccurred(), "Metrics service should exist")
129+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Metrics service should exist")
132130

133131
By("validating that the ServiceMonitor for Prometheus is applied in the namespace")
134132
cmd = exec.Command("kubectl", "get", "ServiceMonitor", "-n", namespace)
135-
_, err = utils.Run(cmd)
136-
Expect(err).NotTo(HaveOccurred(), "ServiceMonitor should exist")
133+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "ServiceMonitor should exist")
137134

138135
By("getting the service account token")
139136
token, err := serviceAccountToken()
@@ -143,18 +140,14 @@ var _ = Describe("Manager", Ordered, func() {
143140
By("waiting for the metrics endpoint to be ready")
144141
verifyMetricsEndpointReady := func(g Gomega) {
145142
cmd := exec.Command("kubectl", "get", "endpoints", metricsServiceName, "-n", namespace)
146-
output, err := utils.Run(cmd)
147-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve endpoints information")
148-
g.Expect(string(output)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
143+
g.Expect(utils.Run(cmd)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
149144
}
150145
Eventually(verifyMetricsEndpointReady).Should(Succeed())
151146

152147
By("verifying that the controller manager is serving the metrics server")
153148
verifyMetricsServerStarted := func(g Gomega) {
154149
cmd := exec.Command("kubectl", "logs", controllerPodName, "-n", namespace)
155-
logs, err := utils.Run(cmd)
156-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve controller manager logs")
157-
g.Expect(string(logs)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
150+
g.Expect(utils.Run(cmd)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
158151
"Metrics server not yet started")
159152
}
160153
Eventually(verifyMetricsServerStarted).Should(Succeed())

‎testdata/project-v4-with-deploy-image/test/e2e/e2e_test.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,15 @@ var _ = Describe("Manager", Ordered, func() {
122122
"--clusterrole=project-v4-with-deploy-image-metrics-reader",
123123
fmt.Sprintf("--serviceaccount=%s:%s", namespace, serviceAccountName),
124124
)
125-
_, err := utils.Run(cmd)
126-
Expect(err).NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
125+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
127126

128127
By("validating that the metrics service is available")
129128
cmd = exec.Command("kubectl", "get", "service", metricsServiceName, "-n", namespace)
130-
_, err = utils.Run(cmd)
131-
Expect(err).NotTo(HaveOccurred(), "Metrics service should exist")
129+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Metrics service should exist")
132130

133131
By("validating that the ServiceMonitor for Prometheus is applied in the namespace")
134132
cmd = exec.Command("kubectl", "get", "ServiceMonitor", "-n", namespace)
135-
_, err = utils.Run(cmd)
136-
Expect(err).NotTo(HaveOccurred(), "ServiceMonitor should exist")
133+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "ServiceMonitor should exist")
137134

138135
By("getting the service account token")
139136
token, err := serviceAccountToken()
@@ -143,18 +140,14 @@ var _ = Describe("Manager", Ordered, func() {
143140
By("waiting for the metrics endpoint to be ready")
144141
verifyMetricsEndpointReady := func(g Gomega) {
145142
cmd := exec.Command("kubectl", "get", "endpoints", metricsServiceName, "-n", namespace)
146-
output, err := utils.Run(cmd)
147-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve endpoints information")
148-
g.Expect(string(output)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
143+
g.Expect(utils.Run(cmd)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
149144
}
150145
Eventually(verifyMetricsEndpointReady).Should(Succeed())
151146

152147
By("verifying that the controller manager is serving the metrics server")
153148
verifyMetricsServerStarted := func(g Gomega) {
154149
cmd := exec.Command("kubectl", "logs", controllerPodName, "-n", namespace)
155-
logs, err := utils.Run(cmd)
156-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve controller manager logs")
157-
g.Expect(string(logs)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
150+
g.Expect(utils.Run(cmd)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
158151
"Metrics server not yet started")
159152
}
160153
Eventually(verifyMetricsServerStarted).Should(Succeed())

‎testdata/project-v4-with-grafana/test/e2e/e2e_test.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,15 @@ var _ = Describe("Manager", Ordered, func() {
122122
"--clusterrole=project-v4-with-grafana-metrics-reader",
123123
fmt.Sprintf("--serviceaccount=%s:%s", namespace, serviceAccountName),
124124
)
125-
_, err := utils.Run(cmd)
126-
Expect(err).NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
125+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
127126

128127
By("validating that the metrics service is available")
129128
cmd = exec.Command("kubectl", "get", "service", metricsServiceName, "-n", namespace)
130-
_, err = utils.Run(cmd)
131-
Expect(err).NotTo(HaveOccurred(), "Metrics service should exist")
129+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Metrics service should exist")
132130

133131
By("validating that the ServiceMonitor for Prometheus is applied in the namespace")
134132
cmd = exec.Command("kubectl", "get", "ServiceMonitor", "-n", namespace)
135-
_, err = utils.Run(cmd)
136-
Expect(err).NotTo(HaveOccurred(), "ServiceMonitor should exist")
133+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "ServiceMonitor should exist")
137134

138135
By("getting the service account token")
139136
token, err := serviceAccountToken()
@@ -143,18 +140,14 @@ var _ = Describe("Manager", Ordered, func() {
143140
By("waiting for the metrics endpoint to be ready")
144141
verifyMetricsEndpointReady := func(g Gomega) {
145142
cmd := exec.Command("kubectl", "get", "endpoints", metricsServiceName, "-n", namespace)
146-
output, err := utils.Run(cmd)
147-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve endpoints information")
148-
g.Expect(string(output)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
143+
g.Expect(utils.Run(cmd)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
149144
}
150145
Eventually(verifyMetricsEndpointReady).Should(Succeed())
151146

152147
By("verifying that the controller manager is serving the metrics server")
153148
verifyMetricsServerStarted := func(g Gomega) {
154149
cmd := exec.Command("kubectl", "logs", controllerPodName, "-n", namespace)
155-
logs, err := utils.Run(cmd)
156-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve controller manager logs")
157-
g.Expect(string(logs)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
150+
g.Expect(utils.Run(cmd)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
158151
"Metrics server not yet started")
159152
}
160153
Eventually(verifyMetricsServerStarted).Should(Succeed())

‎testdata/project-v4/test/e2e/e2e_test.go

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,18 +122,15 @@ var _ = Describe("Manager", Ordered, func() {
122122
"--clusterrole=project-v4-metrics-reader",
123123
fmt.Sprintf("--serviceaccount=%s:%s", namespace, serviceAccountName),
124124
)
125-
_, err := utils.Run(cmd)
126-
Expect(err).NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
125+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Failed to create ClusterRoleBinding")
127126

128127
By("validating that the metrics service is available")
129128
cmd = exec.Command("kubectl", "get", "service", metricsServiceName, "-n", namespace)
130-
_, err = utils.Run(cmd)
131-
Expect(err).NotTo(HaveOccurred(), "Metrics service should exist")
129+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "Metrics service should exist")
132130

133131
By("validating that the ServiceMonitor for Prometheus is applied in the namespace")
134132
cmd = exec.Command("kubectl", "get", "ServiceMonitor", "-n", namespace)
135-
_, err = utils.Run(cmd)
136-
Expect(err).NotTo(HaveOccurred(), "ServiceMonitor should exist")
133+
Expect(utils.Run(cmd)).Error().NotTo(HaveOccurred(), "ServiceMonitor should exist")
137134

138135
By("getting the service account token")
139136
token, err := serviceAccountToken()
@@ -143,18 +140,14 @@ var _ = Describe("Manager", Ordered, func() {
143140
By("waiting for the metrics endpoint to be ready")
144141
verifyMetricsEndpointReady := func(g Gomega) {
145142
cmd := exec.Command("kubectl", "get", "endpoints", metricsServiceName, "-n", namespace)
146-
output, err := utils.Run(cmd)
147-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve endpoints information")
148-
g.Expect(string(output)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
143+
g.Expect(utils.Run(cmd)).To(ContainSubstring("8443"), "Metrics endpoint is not ready")
149144
}
150145
Eventually(verifyMetricsEndpointReady).Should(Succeed())
151146

152147
By("verifying that the controller manager is serving the metrics server")
153148
verifyMetricsServerStarted := func(g Gomega) {
154149
cmd := exec.Command("kubectl", "logs", controllerPodName, "-n", namespace)
155-
logs, err := utils.Run(cmd)
156-
g.Expect(err).NotTo(HaveOccurred(), "Failed to retrieve controller manager logs")
157-
g.Expect(string(logs)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
150+
g.Expect(utils.Run(cmd)).To(ContainSubstring("controller-runtime.metrics\tServing metrics server"),
158151
"Metrics server not yet started")
159152
}
160153
Eventually(verifyMetricsServerStarted).Should(Succeed())

0 commit comments

Comments
 (0)