Merge pull request #2588 from FelipeYepez/revert-service-metrics

Remove deprecated metrics

cmd/glbc/main.go

@@ -47,7 +47,6 @@ import (
 	"k8s.io/ingress-gce/pkg/psc"
 	"k8s.io/ingress-gce/pkg/serviceattachment"
 	serviceattachmentclient "k8s.io/ingress-gce/pkg/serviceattachment/client/clientset/versioned"
-	"k8s.io/ingress-gce/pkg/servicemetrics"
 	"k8s.io/ingress-gce/pkg/svcneg"
 	svcnegclient "k8s.io/ingress-gce/pkg/svcneg/client/clientset/versioned"
 	"k8s.io/ingress-gce/pkg/utils"
@@ -384,12 +383,6 @@ func runControllers(ctx *ingctx.ControllerContext, option runOption, logger klog
 		logger.V(0).Info("PSC Controller started")
 	}
 
-	if flags.F.EnableServiceMetrics {
-		metricsController := servicemetrics.NewController(ctx, flags.F.MetricsExportInterval, stopCh, logger)
-		runWithWg(metricsController.Run, wg)
-		logger.V(0).Info("Service Metrics Controller started")
-	}
-
 	go app.RunSIGTERMHandler(closeStopCh, logger)
 
 	ctx.Start(stopCh)

pkg/flags/flags.go

@@ -118,7 +118,6 @@ var (
 		EnableL4NEG                              bool
 		GateNEGByLock                            bool
 		EnableMultipleIGs                        bool
-		EnableServiceMetrics                     bool
 		EnableL4StrongSessionAffinity            bool
 		EnableNEGLabelPropagation                bool
 		EnableMultiNetworking                    bool
@@ -280,7 +279,6 @@ L7 load balancing. CSV values accepted. Example: -node-port-ranges=80,8080,400-5
 	flag.BoolVar(&F.EnableL4NEG, "enable-l4-neg", false, `Optional, if enabled then the NEG controller will process L4 NEGs.`)
 	flag.BoolVar(&F.GateNEGByLock, "gate-neg-by-lock", false, "If enabled then the NEG controller will be run via leader election with NEG resource lock")
 	flag.BoolVar(&F.EnableIGController, "enable-ig-controller", true, `Optional, if enabled then the IG controller will be run.`)
-	flag.BoolVar(&F.EnableServiceMetrics, "enable-service-metrics", false, `Optional, if enabled then the service metrics controller will be run.`)
 	flag.BoolVar(&F.EnablePSC, "enable-psc", false, "Enable PSC controller")
 	flag.BoolVar(&F.EnableIngressGAFields, "enable-ingress-ga-fields", false, "Enable using Ingress Class GA features")
 	flag.StringVar(&F.GKEClusterName, "gke-cluster-name", "", "The name of the GKE cluster this Ingress Controller will be interacting with")