Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion cns/configuration/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ type CNSConfig struct {
ChannelMode string
InitializeFromCNI bool
ManagedSettings ManagedSettings
Debug bool
MetricsBindAddress string
SyncHostNCTimeoutMs int
SyncHostNCVersionIntervalMs int
TLSCertificatePath string
Expand Down Expand Up @@ -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
}
Expand Down
5 changes: 4 additions & 1 deletion cns/configuration/configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ func TestReadConfigFromFile(t *testing.T) {
NodeID: "abc",
NodeSyncIntervalInSeconds: 30,
},
MetricsBindAddress: ":9091",
SyncHostNCTimeoutMs: 5,
SyncHostNCVersionIntervalMs: 5,
TLSCertificatePath: "/test",
Expand Down Expand Up @@ -190,7 +191,7 @@ func TestSetCNSConfigDefaults(t *testing.T) {
ManagedSettings: ManagedSettings{
NodeSyncIntervalInSeconds: 30,
},
Debug: false,
MetricsBindAddress: ":9090",
SyncHostNCTimeoutMs: 500,
SyncHostNCVersionIntervalMs: 1000,
TelemetrySettings: TelemetrySettings{
Expand All @@ -209,6 +210,7 @@ func TestSetCNSConfigDefaults(t *testing.T) {
ManagedSettings: ManagedSettings{
NodeSyncIntervalInSeconds: 1,
},
MetricsBindAddress: ":9091",
SyncHostNCTimeoutMs: 5,
SyncHostNCVersionIntervalMs: 1,
TelemetrySettings: TelemetrySettings{
Expand All @@ -224,6 +226,7 @@ func TestSetCNSConfigDefaults(t *testing.T) {
ManagedSettings: ManagedSettings{
NodeSyncIntervalInSeconds: 1,
},
MetricsBindAddress: ":9091",
SyncHostNCTimeoutMs: 5,
SyncHostNCVersionIntervalMs: 1,
TelemetrySettings: TelemetrySettings{
Expand Down
40 changes: 5 additions & 35 deletions cns/service/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"encoding/json"
"fmt"
"net/http"
"net/http/pprof"
"os"
"os/signal"
"runtime"
Expand Down Expand Up @@ -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 (
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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")
Expand All @@ -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.
Expand Down Expand Up @@ -1085,7 +1056,6 @@ func InitializeCRDState(ctx context.Context, httpRestService cns.HTTPService, cn
}
}
}()

logger.Printf("initialized and started SyncHostNCVersion loop")

return nil
Expand Down