UPSTREAM: <carry>: openshift: Stop metrics on testing manager

Author: enxebre

Makefile

@@ -42,7 +42,8 @@ dep-ensure: ## Runs dep-ensure and rebuilds Bazel gazelle files.
 
 .PHONY: test
 test: gazelle verify generate fmt vet manifests ## Run tests
-	go test -v -timeout=20m -tags=integration ./pkg/... ./cmd/...
+    # TODO(alberto) remove unused code carried over from upstream.
+	go test -v -timeout=20m -tags=integration ./pkg/... ./cmd/manager/...
 
 .PHONY: manager
 manager: generate fmt vet ## Build manager binary

pkg/controller/cluster/cluster_controller_test.go

@@ -48,7 +48,7 @@ func TestReconcile(t *testing.T) {
 
 	// Setup the Manager and Controller.  Wrap the Controller Reconcile function so it writes each request to a
 	// channel when it is finished.
-	mgr, err := manager.New(cfg, manager.Options{})
+	mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
 	if err != nil {
 		t.Fatalf("error creating new manager: %v", err)
 	}

pkg/controller/machine/machine_controller_test.go

@@ -42,7 +42,7 @@ func TestReconcile(t *testing.T) {
 
 	// Setup the Manager and Controller.  Wrap the Controller Reconcile function so it writes each request to a
 	// channel when it is finished.
-	mgr, err := manager.New(cfg, manager.Options{})
+	mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
 	if err != nil {
 		t.Fatalf("error creating new manager: %v", err)
 	}

pkg/controller/machinedeployment/machinedeployment_controller_test.go

@@ -66,7 +66,7 @@ func TestReconcile(t *testing.T) {
 
 	// Setup the Manager and Controller.  Wrap the Controller Reconcile function so it writes each request to a
 	// channel when it is finished.
-	mgr, err := manager.New(cfg, manager.Options{})
+	mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
 	if err != nil {
 		t.Errorf("error creating new manager: %v", err)
 	}

pkg/controller/machineset/machineset_controller_test.go

@@ -38,7 +38,7 @@ const timeout = time.Second * 5
 func TestReconcile(t *testing.T) {
 	// Setup the Manager and Controller.  Wrap the Controller Reconcile function so it writes each request to a
 	// channel when it is finished.
-	mgr, err := manager.New(cfg, manager.Options{})
+	mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
 	if err != nil {
 		t.Errorf("error creating new manager: %v", err)
 	}

pkg/controller/node/node_controller_test.go

@@ -41,7 +41,7 @@ func TestReconcile(t *testing.T) {
 
 	// Setup the Manager and Controller.  Wrap the Controller Reconcile function so it writes each request to a
 	// channel when it is finished.
-	mgr, err := manager.New(cfg, manager.Options{})
+	mgr, err := manager.New(cfg, manager.Options{MetricsBindAddress: "0"})
 	if err != nil {
 		t.Errorf("error creating new manager: %v", err)
 	}