Skip to content

Commit 84dcde5

Browse files
authored
Merge pull request #455 from bpfman/fix-bpfman-agent-metrics-port-conflict
Disable controller-runtime metrics server in bpfman-agent
2 parents a2e0bdc + 99d1484 commit 84dcde5

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

cmd/bpfman-agent/main.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import (
4646
"sigs.k8s.io/controller-runtime/pkg/healthz"
4747
"sigs.k8s.io/controller-runtime/pkg/log/zap"
4848
"sigs.k8s.io/controller-runtime/pkg/metrics"
49+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
4950

5051
"github.com/prometheus/client_golang/prometheus/promhttp"
5152
//+kubebuilder:scaffold:imports
@@ -349,7 +350,11 @@ func main() {
349350
Scheme: scheme,
350351
PprofBindAddress: pprofAddr,
351352
HealthProbeBindAddress: probeAddr,
352-
LeaderElection: false,
353+
Metrics: metricsserver.Options{
354+
// Disable controller-runtime metrics server.
355+
BindAddress: "0",
356+
},
357+
LeaderElection: false,
353358
// Specify that Secrets's should not be cached.
354359
Client: client.Options{
355360
Cache: &client.CacheOptions{

0 commit comments

Comments
 (0)