Skip to content

Commit 3b8603a

Browse files
committed
Fix e2e autoscaling namespace error
1 parent 59bc823 commit 3b8603a

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

test/e2e/autoscaling/custom_metrics_stackdriver_autoscaling.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,11 +259,11 @@ func (tc *CustomMetricTestCase) Run() {
259259
}
260260
defer monitoring.CleanupDescriptors(gcmService, projectID)
261261

262-
err = monitoring.CreateAdapter(tc.framework.Namespace.ObjectMeta.Name, monitoring.AdapterDefault)
262+
err = monitoring.CreateAdapter(monitoring.AdapterDefault)
263263
if err != nil {
264264
framework.Failf("Failed to set up: %v", err)
265265
}
266-
defer monitoring.CleanupAdapter(tc.framework.Namespace.ObjectMeta.Name, monitoring.AdapterDefault)
266+
defer monitoring.CleanupAdapter(monitoring.AdapterDefault)
267267

268268
// Run application that exports the metric
269269
err = createDeploymentToScale(tc.framework, tc.kubeClient, tc.deployment, tc.pod)

test/e2e/instrumentation/monitoring/custom_metrics_deployments.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ func CreateAdapter(adapterDeploymentFile string) error {
265265
if err != nil {
266266
return err
267267
}
268-
stat, err := framework.RunKubectl("create", "-f", adapterURL)
268+
stat, err := framework.RunKubectl("", "create", "-f", adapterURL)
269269
framework.Logf(stat)
270270
return err
271271
}
@@ -278,7 +278,7 @@ func createClusterAdminBinding() error {
278278
}
279279
serviceAccount := strings.TrimSpace(stdout)
280280
framework.Logf("current service account: %q", serviceAccount)
281-
stat, err := framework.RunKubectl("create", "clusterrolebinding", ClusterAdminBinding, "--clusterrole=cluster-admin", "--user="+serviceAccount)
281+
stat, err := framework.RunKubectl("", "create", "clusterrolebinding", ClusterAdminBinding, "--clusterrole=cluster-admin", "--user="+serviceAccount)
282282
framework.Logf(stat)
283283
return err
284284
}
@@ -317,8 +317,8 @@ func CleanupDescriptors(service *gcm.Service, projectID string) {
317317
}
318318

319319
// CleanupAdapter deletes Custom Metrics - Stackdriver adapter deployments.
320-
func CleanupAdapter(namespace, adapterDeploymentFile string) {
321-
stat, err := framework.RunKubectl(namespace, "delete", "-f", adapterDeploymentFile)
320+
func CleanupAdapter(adapterDeploymentFile string) {
321+
stat, err := framework.RunKubectl("", "delete", "-f", adapterDeploymentFile)
322322
framework.Logf(stat)
323323
if err != nil {
324324
framework.Logf("Failed to delete adapter deployments: %s", err)
@@ -327,11 +327,11 @@ func CleanupAdapter(namespace, adapterDeploymentFile string) {
327327
if err != nil {
328328
framework.Logf("Failed to delete adapter deployment file: %s", err)
329329
}
330-
cleanupClusterAdminBinding(namespace)
330+
cleanupClusterAdminBinding()
331331
}
332332

333-
func cleanupClusterAdminBinding(namespace string) {
334-
stat, err := framework.RunKubectl(namespace, "delete", "clusterrolebinding", ClusterAdminBinding)
333+
func cleanupClusterAdminBinding() {
334+
stat, err := framework.RunKubectl("", "delete", "clusterrolebinding", ClusterAdminBinding)
335335
framework.Logf(stat)
336336
if err != nil {
337337
framework.Logf("Failed to delete cluster admin binding: %s", err)

test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,11 @@ func testCustomMetrics(f *framework.Framework, kubeClient clientset.Interface, c
114114
}
115115
defer CleanupDescriptors(gcmService, projectID)
116116

117-
err = CreateAdapter(f.Namespace.Name, adapterDeployment)
117+
err = CreateAdapter(adapterDeployment)
118118
if err != nil {
119119
framework.Failf("Failed to set up: %s", err)
120120
}
121-
defer CleanupAdapter(f.Namespace.Name, adapterDeployment)
121+
defer CleanupAdapter(adapterDeployment)
122122

123123
_, err = kubeClient.RbacV1().ClusterRoleBindings().Create(context.TODO(), HPAPermissions, metav1.CreateOptions{})
124124
if err != nil {
@@ -162,11 +162,11 @@ func testExternalMetrics(f *framework.Framework, kubeClient clientset.Interface,
162162
defer CleanupDescriptors(gcmService, projectID)
163163

164164
// Both deployments - for old and new resource model - expose External Metrics API.
165-
err = CreateAdapter(f.Namespace.Name, AdapterForOldResourceModel)
165+
err = CreateAdapter(AdapterForOldResourceModel)
166166
if err != nil {
167167
framework.Failf("Failed to set up: %s", err)
168168
}
169-
defer CleanupAdapter(f.Namespace.Name, AdapterForOldResourceModel)
169+
defer CleanupAdapter(AdapterForOldResourceModel)
170170

171171
_, err = kubeClient.RbacV1().ClusterRoleBindings().Create(context.TODO(), HPAPermissions, metav1.CreateOptions{})
172172
if err != nil {

0 commit comments

Comments
 (0)