Revert "move metrics to service port, add healthz, pprof (#1318)" (#1362)

This reverts commit 5ec6a3f.

Author: rbtr

cns/configuration/configuration.go

@@ -22,7 +22,7 @@ type CNSConfig struct {
 	ChannelMode                 string
 	InitializeFromCNI           bool
 	ManagedSettings             ManagedSettings
-	Debug                       bool
+	MetricsBindAddress          string
 	SyncHostNCTimeoutMs         int
 	SyncHostNCVersionIntervalMs int
 	TLSCertificatePath          string
@@ -150,6 +150,9 @@ func SetCNSConfigDefaults(config *CNSConfig) {
 	if config.ChannelMode == "" {
 		config.ChannelMode = cns.Direct
 	}
+	if config.MetricsBindAddress == "" {
+		config.MetricsBindAddress = ":9090"
+	}
 	if config.SyncHostNCVersionIntervalMs == 0 {
 		config.SyncHostNCVersionIntervalMs = 1000 //nolint:gomnd // default times
 	}

cns/configuration/configuration_test.go

@@ -61,6 +61,7 @@ func TestReadConfigFromFile(t *testing.T) {
 					NodeID:                    "abc",
 					NodeSyncIntervalInSeconds: 30,
 				},
+				MetricsBindAddress:          ":9091",
 				SyncHostNCTimeoutMs:         5,
 				SyncHostNCVersionIntervalMs: 5,
 				TLSCertificatePath:          "/test",
@@ -190,7 +191,7 @@ func TestSetCNSConfigDefaults(t *testing.T) {
 				ManagedSettings: ManagedSettings{
 					NodeSyncIntervalInSeconds: 30,
 				},
-				Debug:                       false,
+				MetricsBindAddress:          ":9090",
 				SyncHostNCTimeoutMs:         500,
 				SyncHostNCVersionIntervalMs: 1000,
 				TelemetrySettings: TelemetrySettings{
@@ -209,6 +210,7 @@ func TestSetCNSConfigDefaults(t *testing.T) {
 				ManagedSettings: ManagedSettings{
 					NodeSyncIntervalInSeconds: 1,
 				},
+				MetricsBindAddress:          ":9091",
 				SyncHostNCTimeoutMs:         5,
 				SyncHostNCVersionIntervalMs: 1,
 				TelemetrySettings: TelemetrySettings{
@@ -224,6 +226,7 @@ func TestSetCNSConfigDefaults(t *testing.T) {
 				ManagedSettings: ManagedSettings{
 					NodeSyncIntervalInSeconds: 1,
 				},
+				MetricsBindAddress:          ":9091",
 				SyncHostNCTimeoutMs:         5,
 				SyncHostNCVersionIntervalMs: 1,
 				TelemetrySettings: TelemetrySettings{

cns/service/main.go

@@ -9,7 +9,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/http"
-	"net/http/pprof"
 	"os"
 	"os/signal"
 	"runtime"
@@ -47,16 +46,13 @@ import (
 	"github.com/Azure/azure-container-networking/store"
 	"github.com/avast/retry-go/v3"
 	"github.com/pkg/errors"
-	"github.com/prometheus/client_golang/prometheus/promhttp"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/healthz"
-	"sigs.k8s.io/controller-runtime/pkg/metrics"
 )
 
 const (
@@ -334,12 +330,7 @@ func registerNode(httpc *http.Client, httpRestService cns.HTTPService, dncEP, in
 }
 
 // sendRegisterNodeRequest func helps in registering the node until there is an error.
-func sendRegisterNodeRequest(
-	httpc *http.Client,
-	httpRestService cns.HTTPService,
-	nodeRegisterRequest cns.NodeRegisterRequest,
-	registerURL string,
-) error {
+func sendRegisterNodeRequest(httpc *http.Client, httpRestService cns.HTTPService, nodeRegisterRequest cns.NodeRegisterRequest, registerURL string) error {
 	var body bytes.Buffer
 	err := json.NewEncoder(&body).Encode(nodeRegisterRequest)
 	if err != nil {
@@ -999,9 +990,10 @@ func InitializeCRDState(ctx context.Context, httpRestService cns.HTTPService, cn
 	})
 
 	manager, err := ctrl.NewManager(kubeConfig, ctrl.Options{
-		Scheme:    nodenetworkconfig.Scheme,
-		Namespace: "kube-system", // TODO(rbtr): namespace should be in the cns config
-		NewCache:  nodeScopedCache,
+		Scheme:             nodenetworkconfig.Scheme,
+		MetricsBindAddress: cnsconfig.MetricsBindAddress,
+		Namespace:          "kube-system", // TODO(rbtr): namespace should be in the cns config
+		NewCache:           nodeScopedCache,
 	})
 	if err != nil {
 		return errors.Wrap(err, "failed to create manager")
@@ -1020,27 +1012,6 @@ func InitializeCRDState(ctx context.Context, httpRestService cns.HTTPService, cn
 		return errors.Wrapf(err, "failed to setup reconciler with manager")
 	}
 
-	// adding some routes to the root serve mux
-	mux := httpRestServiceImplementation.Listener.GetMux()
-
-	if cnsconfig.Debug {
-		// add pprof endpoints
-		mux.HandleFunc("/debug/pprof/", pprof.Index)
-		mux.HandleFunc("/debug/pprof/cmdline", pprof.Cmdline)
-		mux.HandleFunc("/debug/pprof/profile", pprof.Profile)
-		mux.HandleFunc("/debug/pprof/symbol", pprof.Symbol)
-		mux.HandleFunc("/debug/pprof/trace", pprof.Trace)
-	}
-
-	// add metrics endpoints
-	mux.Handle("/metrics", promhttp.HandlerFor(metrics.Registry, promhttp.HandlerOpts{
-		ErrorHandling: promhttp.HTTPErrorOnError,
-	}))
-
-	// add healthz endpoints
-	healthzhandler := healthz.Handler{}
-	mux.Handle("/healthz", http.StripPrefix("/healthz", &healthzhandler))
-
 	// Start the Manager which starts the reconcile loop.
 	// The Reconciler will send an initial NodeNetworkConfig update to the PoolMonitor, starting the
 	// Monitor's internal loop.
@@ -1085,7 +1056,6 @@ func InitializeCRDState(ctx context.Context, httpRestService cns.HTTPService, cn
 			}
 		}
 	}()
-
 	logger.Printf("initialized and started SyncHostNCVersion loop")
 
 	return nil