Skip to content
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

Remove deprecated metrics #2588

Merged
merged 1 commit into from
Jun 28, 2024
Merged

Remove deprecated metrics #2588

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
7 changes: 0 additions & 7 deletions cmd/glbc/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 0 additions & 2 deletions pkg/flags/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ var (
EnableL4NEG bool
GateNEGByLock bool
EnableMultipleIGs bool
EnableServiceMetrics bool
EnableL4StrongSessionAffinity bool
EnableNEGLabelPropagation bool
EnableMultiNetworking bool
Expand Down Expand Up @@ -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")
Expand Down
Loading