Reapply "Drop obsolete go collector in favor of controller-runtime" (#499)

This reverts commit 9f48634.

Breaking back-and-forth in controller-runtime.
This adapts to kubernetes-sigs/controller-runtime#3070

Author: timebertt

cmd/sharder/app/app.go

@@ -21,7 +21,6 @@ import (
 	"fmt"
 
 	"github.com/go-logr/logr"
-	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"go.uber.org/automaxprocs/maxprocs"
@@ -32,7 +31,6 @@ import (
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
-	"sigs.k8s.io/controller-runtime/pkg/metrics"
 
 	"github.com/timebertt/kubernetes-controller-sharding/pkg/controller"
 	healthzutils "github.com/timebertt/kubernetes-controller-sharding/pkg/utils/healthz"
@@ -92,10 +90,6 @@ func run(ctx context.Context, log logr.Logger, opts *options) error {
 		log.Error(err, "Failed to set GOMAXPROCS")
 	}
 
-	// replace deprecated legacy go collector
-	metrics.Registry.Unregister(collectors.NewGoCollector())
-	metrics.Registry.MustRegister(collectors.NewGoCollector(collectors.WithGoCollectorRuntimeMetrics(collectors.MetricsAll)))
-
 	log.Info("Setting up manager")
 	mgr, err := manager.New(opts.restConfig, opts.managerOptions)
 	if err != nil {

webhosting-operator/cmd/webhosting-operator/main.go

@@ -24,7 +24,6 @@ import (
 	goruntime "runtime"
 	"strconv"
 
-	"github.com/prometheus/client_golang/prometheus/collectors"
 	"go.uber.org/automaxprocs/maxprocs"
 	"go.uber.org/zap/zapcore"
 	appsv1 "k8s.io/api/apps/v1"
@@ -43,7 +42,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
-	"sigs.k8s.io/controller-runtime/pkg/metrics"
 	"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 
@@ -102,10 +100,6 @@ func main() {
 		setupLog.Error(err, "Failed to set GOMAXPROCS")
 	}
 
-	// replace deprecated legacy go collector
-	metrics.Registry.Unregister(collectors.NewGoCollector())
-	metrics.Registry.MustRegister(collectors.NewGoCollector(collectors.WithGoCollectorRuntimeMetrics(collectors.MetricsAll)))
-
 	mgr, err := ctrl.NewManager(opts.restConfig, opts.managerOptions)
 	if err != nil {
 		setupLog.Error(err, "unable to start manager")