fix: use cluster metrics-server instead of plugin metrics endpoints

This commit is contained in:
2026-07-12 15:54:27 +03:30
parent 077c472b9d
commit c5da6d9088
6 changed files with 13 additions and 115 deletions
+7 -71
View File
@@ -2,13 +2,9 @@ package main
import (
"context"
"errors"
"fmt"
"net"
"net/http"
"os"
"os/signal"
"strings"
"syscall"
"time"
@@ -17,7 +13,6 @@ import (
"github.com/KubelanCloud/kks-provider-plugin/pkg/kloudlb/controller"
"github.com/KubelanCloud/kks-provider-plugin/pkg/kloudlb/speaker"
lbapi "github.com/KubelanCloud/kks-provider-plugin/pkg/lb/api"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/spf13/cobra"
"go.uber.org/zap"
"k8s.io/client-go/kubernetes"
@@ -39,7 +34,7 @@ func main() {
Long: "Runs the in-cluster provider components for CSI and LoadBalancer integration with kks management services.",
}
rootCmd.AddCommand(csiCmd(logger), lbControllerCmd(logger), lbSpeakerCmd(logger))
rootCmd.AddCommand(csiCmd(logger), lbControllerCmd(), lbSpeakerCmd())
if err := rootCmd.Execute(); err != nil {
os.Exit(1)
@@ -48,26 +43,22 @@ func main() {
func csiCmd(logger *zap.Logger) *cobra.Command {
configPath := "csi.hcl"
metricsBindAddress := ":10080"
cmd := &cobra.Command{
Use: "csi",
Short: "Run the Kloud CSI driver",
RunE: func(cmd *cobra.Command, args []string) error {
return runCSI(cmd, configPath, metricsBindAddress, logger)
return runCSI(cmd, configPath, logger)
},
}
cmd.Flags().StringVarP(&configPath, "config-file", "c", "csi.hcl", "Path to driver config (optional when using env vars)")
cmd.Flags().StringVar(&metricsBindAddress, "metrics-bind-address", ":10080", "Address to bind metrics server (set to 'off' to disable)")
return cmd
}
func lbControllerCmd(logger *zap.Logger) *cobra.Command {
func lbControllerCmd() *cobra.Command {
var (
apiURL string
token string
metricsBindAddress string
apiURL string
token string
)
metricsBindAddress = ":10081"
cmd := &cobra.Command{
Use: "lb-controller",
Short: "Run the KloudLB Service controller",
@@ -98,20 +89,15 @@ func lbControllerCmd(logger *zap.Logger) *cobra.Command {
ctx, cancel := signalContext(cmd.Context())
defer cancel()
if err := startMetricsServer(ctx, logger, metricsBindAddress); err != nil {
return err
}
return ctrl.Run(ctx, 2)
},
}
cmd.Flags().StringVar(&apiURL, "api-url", "", "KKS LoadBalancer API base URL")
cmd.Flags().StringVar(&token, "access-token", "", "Cluster LB access token")
cmd.Flags().StringVar(&metricsBindAddress, "metrics-bind-address", ":10081", "Address to bind metrics server (set to 'off' to disable)")
return cmd
}
func lbSpeakerCmd(logger *zap.Logger) *cobra.Command {
metricsBindAddress := ":10082"
func lbSpeakerCmd() *cobra.Command {
cmd := &cobra.Command{
Use: "lb-speaker",
Short: "Run the KloudLB L2 speaker",
@@ -132,17 +118,13 @@ func lbSpeakerCmd(logger *zap.Logger) *cobra.Command {
ctx, cancel := signalContext(cmd.Context())
defer cancel()
if err := startMetricsServer(ctx, logger, metricsBindAddress); err != nil {
return err
}
return spk.Run(ctx)
},
}
cmd.Flags().StringVar(&metricsBindAddress, "metrics-bind-address", ":10082", "Address to bind metrics server (set to 'off' to disable)")
return cmd
}
func runCSI(cmd *cobra.Command, configPath, metricsBindAddress string, logger *zap.Logger) error {
func runCSI(cmd *cobra.Command, configPath string, logger *zap.Logger) error {
cfg, err := config.LoadClient(configPath)
if err != nil {
return fmt.Errorf("load config: %w", err)
@@ -150,57 +132,11 @@ func runCSI(cmd *cobra.Command, configPath, metricsBindAddress string, logger *z
ctx, cancel := signalContext(cmd.Context())
defer cancel()
if err := startMetricsServer(ctx, logger, metricsBindAddress); err != nil {
return err
}
logger.Sugar().Infof("loaded csi driver config from %s", configPath)
return driver.Run(ctx, cfg, logger)
}
func startMetricsServer(ctx context.Context, logger *zap.Logger, bindAddress string) error {
bindAddress = strings.TrimSpace(bindAddress)
if bindAddress == "" || strings.EqualFold(bindAddress, "off") {
logger.Info("metrics server disabled")
return nil
}
listener, err := net.Listen("tcp", bindAddress)
if err != nil {
return fmt.Errorf("listen metrics server on %s: %w", bindAddress, err)
}
server := &http.Server{
Addr: bindAddress,
Handler: metricsMux(),
ReadHeaderTimeout: 5 * time.Second,
}
go func() {
<-ctx.Done()
shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
defer cancel()
if err := server.Shutdown(shutdownCtx); err != nil && !errors.Is(err, http.ErrServerClosed) {
logger.Error("failed to shutdown metrics server", zap.Error(err))
}
}()
go func() {
logger.Sugar().Infof("metrics server listening on %s", bindAddress)
if err := server.Serve(listener); err != nil && !errors.Is(err, http.ErrServerClosed) {
logger.Error("metrics server stopped unexpectedly", zap.Error(err))
}
}()
return nil
}
func metricsMux() *http.ServeMux {
mux := http.NewServeMux()
mux.Handle("/metrics", promhttp.Handler())
return mux
}
func restConfig() (*rest.Config, error) {
if cfg, err := rest.InClusterConfig(); err == nil {
return cfg, nil