Merge pull request #4421 from twz123/kine-metrics-port

Change kine metrics port from 8080 to 2380

pkg/component/controller/kine.go

@@ -118,6 +118,8 @@ func (k *Kine) Start(ctx context.Context) error {
 			// invalid URLs that are understood by kine.
 			// https://github.com/k3s-io/kine/blob/v0.10.1/pkg/endpoint/endpoint.go#L277-L285
 			fmt.Sprintf("--listen-address=unix://%s", k.K0sVars.KineSocketPath),
+			// Enable metrics on port 2380. The default is 8080, which clashes with kube-router.
+			"--metrics-bind-address=:2380",
 		},
 		UID: k.uid,
 		GID: k.gid,

pkg/component/controller/metrics.go

@@ -205,7 +205,7 @@ func (m *Metrics) newKineJob() (*job, error) {
 
 	return &job{
 		log:          m.log.WithField("metrics_job", "kine"),
-		scrapeURL:    "http://localhost:8080/metrics",
+		scrapeURL:    "http://localhost:2380/metrics",
 		name:         "kine",
 		hostname:     m.hostname,
 		scrapeClient: httpClient,