feat: consolidate provider plugin and chart

This commit is contained in:
2026-07-12 14:42:22 +03:30
parent 4996a511eb
commit 077c472b9d
48 changed files with 1870 additions and 854 deletions
+180 -12
View File
@@ -2,15 +2,27 @@ package main
import (
"context"
"errors"
"fmt"
"net"
"net/http"
"os"
"os/signal"
"strings"
"syscall"
"time"
"github.com/KubelanCloud/kks-csi-plugin/config"
"github.com/KubelanCloud/kks-csi-plugin/pkg/csi/driver"
"github.com/KubelanCloud/kks-provider-plugin/config"
"github.com/KubelanCloud/kks-provider-plugin/pkg/csi/driver"
"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"
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"
)
func main() {
@@ -21,24 +33,116 @@ func main() {
}
defer logger.Sync() //nolint:errcheck
configPath := "csi.hcl"
rootCmd := &cobra.Command{
Use: "kks-csi",
Short: "Kloud CSI driver for user cluster nodes",
Long: "Runs the in-cluster CSI gRPC driver. Storage operations are sent to the kks management CSI server.",
RunE: func(cmd *cobra.Command, args []string) error {
return run(cmd, configPath, logger)
},
Use: "kks-provider",
Short: "Kloud provider plugin for user cluster nodes",
Long: "Runs the in-cluster provider components for CSI and LoadBalancer integration with kks management services.",
}
rootCmd.PersistentFlags().StringVarP(&configPath, "config-file", "c", "csi.hcl", "Path to driver config (optional when using env vars)")
rootCmd.AddCommand(csiCmd(logger), lbControllerCmd(logger), lbSpeakerCmd(logger))
if err := rootCmd.Execute(); err != nil {
os.Exit(1)
}
}
func run(cmd *cobra.Command, configPath string, logger *zap.Logger) error {
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)
},
}
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 {
var (
apiURL string
token string
metricsBindAddress string
)
metricsBindAddress = ":10081"
cmd := &cobra.Command{
Use: "lb-controller",
Short: "Run the KloudLB Service controller",
RunE: func(cmd *cobra.Command, args []string) error {
apiURL = envOr(apiURL, "KLOUD_LB_API_URL")
token = envOr(token, "KLOUD_LB_ACCESS_TOKEN")
if apiURL == "" {
return fmt.Errorf("KLOUD_LB_API_URL is required")
}
if token == "" {
return fmt.Errorf("KLOUD_LB_ACCESS_TOKEN is required")
}
cfg, err := restConfig()
if err != nil {
return err
}
client, err := kubernetes.NewForConfig(cfg)
if err != nil {
return err
}
lbClient := lbapi.NewClient(lbapi.ClientConfig{BaseURL: apiURL, Token: token, Timeout: 30 * time.Second})
ctrl, err := controller.New(client, lbClient)
if err != nil {
return err
}
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"
cmd := &cobra.Command{
Use: "lb-speaker",
Short: "Run the KloudLB L2 speaker",
RunE: func(cmd *cobra.Command, args []string) error {
cfg, err := restConfig()
if err != nil {
return err
}
client, err := kubernetes.NewForConfig(cfg)
if err != nil {
return err
}
spk, err := speaker.New(client, speaker.NodeNameFromEnv(), speaker.InterfaceFromEnv())
if err != nil {
return err
}
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 {
cfg, err := config.LoadClient(configPath)
if err != nil {
return fmt.Errorf("load config: %w", err)
@@ -46,11 +150,75 @@ func run(cmd *cobra.Command, configPath string, logger *zap.Logger) error {
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
}
kubeconfig := os.Getenv("KUBECONFIG")
if kubeconfig == "" {
kubeconfig = clientcmd.RecommendedHomeFile
}
return clientcmd.BuildConfigFromFlags("", kubeconfig)
}
func envOr(flagValue, envKey string) string {
if flagValue != "" {
return flagValue
}
return os.Getenv(envKey)
}
func signalContext(parent context.Context) (context.Context, context.CancelFunc) {
ctx, cancel := context.WithCancel(parent)
go func() {