feat: add ReschedulePolicy for pp/cpp

.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
 
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.52.2
+          version: v1.53.3
           only-new-issues: true
           args: >
             --timeout=5m

.gitignore

@@ -28,6 +28,7 @@ output
 vendor
 .vscode
 *debug*
+.DS_Store
 
 # log files
 *.log

Makefile

@@ -31,7 +31,7 @@ all: build
 #   make build BUILD_PLATFORMS=linux/amd64,darwin/amd64
 .PHONY: build
 build:
-	BUILD_FLAGS=$(BUILD_FLAGS) TARGET_NAME=$(TARGET_NAME) GOPROXY=$(GOPROXY) bash hack/make-rules/build.sh
+	BUILD_FLAGS="$(BUILD_FLAGS)" TARGET_NAME="$(TARGET_NAME)" GOPROXY="$(GOPROXY)" bash hack/make-rules/build.sh
 
 # Start a local kubeadmiral cluster for developers.
 #

cmd/controller-manager/app/controllermanager.go

@@ -28,28 +28,41 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 
 	"github.com/kubewharf/kubeadmiral/cmd/controller-manager/app/options"
-	fedcorev1a1 "github.com/kubewharf/kubeadmiral/pkg/apis/core/v1alpha1"
 	"github.com/kubewharf/kubeadmiral/pkg/controllermanager"
 	"github.com/kubewharf/kubeadmiral/pkg/controllermanager/healthcheck"
 	fedleaderelection "github.com/kubewharf/kubeadmiral/pkg/controllermanager/leaderelection"
 	controllercontext "github.com/kubewharf/kubeadmiral/pkg/controllers/context"
 )
 
 const (
-	FederatedClusterControllerName = "cluster"
-	TypeConfigControllerName       = "typeconfig"
-	MonitorControllerName          = "monitor"
-	FollowerControllerName         = "follower"
+	FederatedClusterControllerName         = "cluster"
+	FederateControllerName                 = "federate"
+	FollowerControllerName                 = "follower"
+	PolicyRCControllerName                 = "policyrc"
+	OverrideControllerName                 = "override"
+	NamespaceAutoPropagationControllerName = "nsautoprop"
+	StatusControllerName                   = "status"
+	SchedulerName                          = "scheduler"
+	SyncControllerName                     = "sync"
+	AutoMigrationControllerName            = "auto-migration"
+	StatusAggregatorControllerName         = "status-aggregator"
 )
 
 var knownControllers = map[string]controllermanager.StartControllerFunc{
-	FederatedClusterControllerName: startFederatedClusterController,
-	TypeConfigControllerName:       startTypeConfigController,
-	MonitorControllerName:          startMonitorController,
-	FollowerControllerName:         startFollowerController,
+	FederateControllerName:                 startFederateController,
+	PolicyRCControllerName:                 startPolicyRCController,
+	OverrideControllerName:                 startOverridePolicyController,
+	NamespaceAutoPropagationControllerName: startNamespaceAutoPropagationController,
+	StatusControllerName:                   startStatusController,
+	FederatedClusterControllerName:         startFederatedClusterController,
+	SchedulerName:                          startScheduler,
+	SyncControllerName:                     startSyncController,
+	FollowerControllerName:                 startFollowerController,
+	AutoMigrationControllerName:            startAutoMigrationController,
+	StatusAggregatorControllerName:         startStatusAggregatorController,
 }
 
-var controllersDisabledByDefault = sets.New(MonitorControllerName)
+var controllersDisabledByDefault = sets.New[string]()
 
 // Run starts the controller manager according to the given options.
 func Run(ctx context.Context, opts *options.Options) {
@@ -77,7 +90,7 @@ func Run(ctx context.Context, opts *options.Options) {
 		defer klog.Infoln("Ready to stop controllers")
 		klog.Infoln("Ready to start controllers")
 
-		err := startControllers(ctx, controllerCtx, knownControllers, knownFTCSubControllers, opts.Controllers, healthCheckHandler)
+		err := startControllers(ctx, controllerCtx, knownControllers, opts.Controllers, healthCheckHandler)
 		if err != nil {
 			klog.Fatalf("Error starting controllers %s: %v", opts.Controllers, err)
 		}
@@ -127,7 +140,6 @@ func startControllers(
 	ctx context.Context,
 	controllerCtx *controllercontext.Context,
 	startControllerFuncs map[string]controllermanager.StartControllerFunc,
-	ftcSubControllerInitFuncs map[string]controllermanager.FTCSubControllerInitFuncs,
 	enabledControllers []string,
 	healthCheckHandler *healthcheck.MutableHealthCheckHandler,
 ) error {
@@ -153,26 +165,5 @@ func startControllers(
 		})
 	}
 
-	manager := NewFederatedTypeConfigManager(
-		controllerCtx.FedInformerFactory.Core().V1alpha1().FederatedTypeConfigs(),
-		controllerCtx,
-		healthCheckHandler,
-		controllerCtx.Metrics,
-	)
-	for controllerName, initFuncs := range ftcSubControllerInitFuncs {
-		controllerName := controllerName
-		initFuncs := initFuncs
-		manager.RegisterSubController(controllerName, initFuncs.StartFunc, func(typeConfig *fedcorev1a1.FederatedTypeConfig) bool {
-			if !isControllerEnabled(controllerName, controllersDisabledByDefault, enabledControllers) {
-				return false
-			}
-			if initFuncs.IsEnabledFunc != nil {
-				return initFuncs.IsEnabledFunc(typeConfig)
-			}
-			return true
-		})
-	}
-	go manager.Run(ctx)
-
 	return nil
 }