refactor: sync controller

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

@@ -43,6 +43,7 @@ const (
 	NamespaceAutoPropagationControllerName = "nsautoprop"
 	StatusControllerName                   = "status"
 	SchedulerName                          = "scheduler"
+	SyncControllerName                     = "sync"
 )
 
 var knownControllers = map[string]controllermanager.StartControllerFunc{
@@ -53,6 +54,7 @@ var knownControllers = map[string]controllermanager.StartControllerFunc{
 	StatusControllerName:                   startStatusController,
 	FederatedClusterControllerName:         startFederatedClusterController,
 	SchedulerName:                          startScheduler,
+	SyncControllerName:                     startSyncController,
 }
 
 var controllersDisabledByDefault = sets.New[string]()

cmd/controller-manager/app/core.go

@@ -25,12 +25,13 @@ import (
 	"github.com/kubewharf/kubeadmiral/pkg/controllermanager"
 	controllercontext "github.com/kubewharf/kubeadmiral/pkg/controllers/context"
 	"github.com/kubewharf/kubeadmiral/pkg/controllers/federate"
+	"github.com/kubewharf/kubeadmiral/pkg/controllers/federatedcluster"
 	"github.com/kubewharf/kubeadmiral/pkg/controllers/nsautoprop"
 	"github.com/kubewharf/kubeadmiral/pkg/controllers/override"
 	"github.com/kubewharf/kubeadmiral/pkg/controllers/policyrc"
-	"github.com/kubewharf/kubeadmiral/pkg/controllers/status"
-	"github.com/kubewharf/kubeadmiral/pkg/controllers/federatedcluster"
 	"github.com/kubewharf/kubeadmiral/pkg/controllers/scheduler"
+	"github.com/kubewharf/kubeadmiral/pkg/controllers/status"
+	"github.com/kubewharf/kubeadmiral/pkg/controllers/sync"
 )
 
 func startFederateController(
@@ -207,3 +208,32 @@ func startScheduler(
 
 	return scheduler, nil
 }
+
+func startSyncController(
+	ctx context.Context,
+	controllerCtx *controllercontext.Context,
+) (controllermanager.Controller, error) {
+	syncController, err := sync.NewSyncController(
+		controllerCtx.KubeClientset,
+		controllerCtx.FedClientset,
+		controllerCtx.FedInformerFactory.Core().V1alpha1().FederatedObjects(),
+		controllerCtx.FedInformerFactory.Core().V1alpha1().ClusterFederatedObjects(),
+		controllerCtx.InformerManager,
+		controllerCtx.FederatedInformerManager,
+		controllerCtx.FedSystemNamespace,
+		controllerCtx.TargetNamespace,
+		controllerCtx.ClusterAvailableDelay,
+		controllerCtx.ClusterUnavailableDelay,
+		controllerCtx.ComponentConfig.MemberObjectEnqueueDelay,
+		klog.Background(),
+		controllerCtx.WorkerCount,
+		controllerCtx.Metrics,
+	)
+	if err != nil {
+		return nil, fmt.Errorf("error creating sync controller: %w", err)
+	}
+
+	go syncController.Run(ctx)
+
+	return syncController, nil
+}

config/crds/core.kubeadmiral.io_clusterfederatedobjects.yaml

@@ -146,10 +146,6 @@ spec:
                       - status
                     type: object
                   type: array
-                collisionCount:
-                  description: CollisionCount can be used in conjunction with RevisionHistory to implement rollbacks.
-                  format: int32
-                  type: integer
                 conditions:
                   description: Conditions describe the current state of this FederatedObject.
                   items:

config/crds/core.kubeadmiral.io_clusterpropagatedversions.yaml

@@ -19,7 +19,7 @@ spec:
     - name: v1alpha1
       schema:
         openAPIV3Schema:
-          description: ClusterPropagatedVersion holds version information about the state propagated from KubeFed APIs (configured by FederatedTypeConfig resources) to member clusters. The name of a ClusterPropagatedVersion encodes the kind and name of the resource it stores information for (i.e. <lower-case kind>-<resource name>). If a target resource has a populated metadata.Generation field, the generation will be stored with a prefix of `gen:` as the version for the cluster.  If metadata.Generation is not available, metadata.ResourceVersion will be stored with a prefix of `rv:` as the version for the cluster.
+          description: ClusterPropagatedVersion holds version information about the state propagated from ClusterFederatedObject to member clusters. The name of a ClusterPropagatedVersion is the same as its ClusterFederatedObject. If a target resource has a populated metadata.Generation field, the generation will be stored with a prefix of `gen:` as the version for the cluster.  If metadata.Generation is not available, metadata.ResourceVersion will be stored with a prefix of `rv:` as the version for the cluster.
           properties:
             apiVersion:
               description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
@@ -40,7 +40,7 @@ spec:
                         description: The name of the cluster the version is for.
                         type: string
                       version:
-                        description: The last version produced for the resource by a KubeFed operation.
+                        description: The last version produced for the resource by a KubeAdmiral operation.
                         type: string
                     required:
                       - clusterName

config/crds/core.kubeadmiral.io_federatedobjects.yaml

@@ -146,10 +146,6 @@ spec:
                       - status
                     type: object
                   type: array
-                collisionCount:
-                  description: CollisionCount can be used in conjunction with RevisionHistory to implement rollbacks.
-                  format: int32
-                  type: integer
                 conditions:
                   description: Conditions describe the current state of this FederatedObject.
                   items:

config/crds/core.kubeadmiral.io_federatedtypeconfigs.yaml

@@ -68,24 +68,6 @@ spec:
                       description: Path to a numeric field that reflects the number of replicas that the object currently has. E.g. `status.replicas` for Deployment and ReplicaSet.
                       type: string
                   type: object
-                revisionHistory:
-                  description: Configuration for RevisionHistory. If left empty, the RevisionHistory feature will be disabled.
-                  properties:
-                    enabled:
-                      description: Whether or not preserve a RevisionHistory for the federated object during updates.
-                      type: boolean
-                  required:
-                    - enabled
-                  type: object
-                rolloutPlan:
-                  description: Configuration for RolloutPlan. If left empty, the RolloutPlan feature will be disabled.
-                  properties:
-                    enabled:
-                      description: Whether or not to synchronize the rollout process across clusters.
-                      type: boolean
-                  required:
-                    - enabled
-                  type: object
                 sourceType:
                   description: The API resource type to be federated.
                   properties:

config/crds/core.kubeadmiral.io_propagatedversions.yaml

@@ -19,7 +19,7 @@ spec:
     - name: v1alpha1
       schema:
         openAPIV3Schema:
-          description: PropagatedVersion holds version information about the state propagated from KubeFed APIs (configured by FederatedTypeConfig resources) to member clusters. The name of a PropagatedVersion encodes the kind and name of the resource it stores information for (i.e. <lower-case kind>-<resource name>). If a target resource has a populated metadata.Generation field, the generation will be stored with a prefix of `gen:` as the version for the cluster.  If metadata.Generation is not available, metadata.ResourceVersion will be stored with a prefix of `rv:` as the version for the cluster.
+          description: PropagatedVersion holds version information about the state propagated from FederatedObject to member clusters. The name of a PropagatedVersion is the same as its FederatedObject. If a target resource has a populated metadata.Generation field, the generation will be stored with a prefix of `gen:` as the version for the cluster.  If metadata.Generation is not available, metadata.ResourceVersion will be stored with a prefix of `rv:` as the version for the cluster.
           properties:
             apiVersion:
               description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
@@ -40,7 +40,7 @@ spec:
                         description: The name of the cluster the version is for.
                         type: string
                       version:
-                        description: The last version produced for the resource by a KubeFed operation.
+                        description: The last version produced for the resource by a KubeAdmiral operation.
                         type: string
                     required:
                       - clusterName

pkg/apis/core/v1alpha1/extensions_federatedobject.go

@@ -17,13 +17,13 @@ limitations under the License.
 package v1alpha1
 
 import (
-	"encoding/json"
 	"reflect"
 	"sort"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	k8sjson "k8s.io/apimachinery/pkg/util/json"
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
@@ -222,16 +222,12 @@ func (spec *GenericFederatedObjectSpec) GetTemplateAsUnstructured() (*unstructur
 	return template, nil
 }
 
-// GetTemplateGVK returns the GVK of the FederatedObject's source object by parsing the FederatedObject's template.
-func (spec *GenericFederatedObjectSpec) GetTemplateGVK() (schema.GroupVersionKind, error) {
-	type partialTypeMetadata struct {
-		metav1.TypeMeta `json:",inline"`
-	}
-	metadata := &partialTypeMetadata{}
-	if err := json.Unmarshal(spec.Template.Raw, metadata); err != nil {
-		return schema.GroupVersionKind{}, nil
+func (spec *GenericFederatedObjectSpec) GetTemplateMetadata() (*metav1.PartialObjectMetadata, error) {
+	metadata := &metav1.PartialObjectMetadata{}
+	if err := k8sjson.Unmarshal(spec.Template.Raw, metadata); err != nil {
+		return nil, err
 	}
-	return metadata.GroupVersionKind(), nil
+	return metadata, nil
 }
 
 // Follower extensions

pkg/apis/core/v1alpha1/extensions_federatedtypeconfig.go

@@ -76,14 +76,6 @@ func (f *FederatedTypeConfig) GetPolicyRcEnabled() bool {
 	return true // TODO: should this be configurable?
 }
 
-func (f *FederatedTypeConfig) GetRevisionHistoryEnabled() bool {
-	return f.Spec.RevisionHistory != nil && f.Spec.RevisionHistory.Enabled
-}
-
-func (f *FederatedTypeConfig) GetRolloutPlanEnabled() bool {
-	return f.Spec.RolloutPlan != nil && f.Spec.RolloutPlan.Enabled
-}
-
 func (f *FederatedTypeConfig) GetControllers() [][]string {
 	return f.Spec.Controllers
 }

pkg/apis/core/v1alpha1/types_federatedobject.go

@@ -116,10 +116,6 @@ type GenericFederatedObjectStatus struct {
 	Conditions []GenericFederatedObjectCondition `json:"conditions,omitempty"`
 	// Clusters contains the propagation status of the Kubernetes object for individual member clusters.
 	Clusters []PropagationStatus `json:"clusters,omitempty"`
-
-	// CollisionCount can be used in conjunction with RevisionHistory to implement rollbacks.
-	// +optional
-	CollisionCount *int32 `json:"collisionCount,omitempty"`
 }
 
 // PlacementWithController describes the member clusters that a Kubernetes object should be propagated to.
@@ -211,12 +207,8 @@ type FederatedObjectConditionReason string
 
 const (
 	AggregateSuccess       FederatedObjectConditionReason = ""
-	SyncRevisionsFailed    FederatedObjectConditionReason = "SyncRevisionsFailed"
 	ClusterRetrievalFailed FederatedObjectConditionReason = "ClusterRetrievalFailed"
-	ComputePlacementFailed FederatedObjectConditionReason = "ComputePlacementFailed"
-	PlanRolloutFailed      FederatedObjectConditionReason = "PlanRolloutFailed"
 	CheckClusters          FederatedObjectConditionReason = "CheckClusters"
-	NamespaceNotFederated  FederatedObjectConditionReason = "NamespaceNotFederated"
 	EnsureDeletionFailed   FederatedObjectConditionReason = "EnsureDeletionFailed"
 )
 

pkg/apis/core/v1alpha1/types_federatedtypeconfig.go

@@ -56,12 +56,6 @@ type FederatedTypeConfigSpec struct {
 	// Configuration for StatusAggregation. If left empty, the StatusAggregation feature will be disabled.
 	// +optional
 	StatusAggregation *StatusAggregationConfig `json:"statusAggregation,omitempty"`
-	// Configuration for RevisionHistory. If left empty, the RevisionHistory feature will be disabled.
-	// +optional
-	RevisionHistory *RevisionHistoryConfig `json:"revisionHistory,omitempty"`
-	// Configuration for RolloutPlan. If left empty, the RolloutPlan feature will be disabled.
-	// +optional
-	RolloutPlan *RolloutPlanConfig `json:"rolloutPlan,omitempty"`
 	// Configuration for StatusCollection. If left empty, the StatusCollection feature will be disabled.
 	// +optional
 	StatusCollection *StatusCollectionConfig `json:"statusCollection,omitempty"`
@@ -124,18 +118,6 @@ type StatusAggregationConfig struct {
 	Enabled bool `json:"enabled"`
 }
 
-// RevisionHistoryConfig defines the configurations for the RevisionHistory feature.
-type RevisionHistoryConfig struct {
-	// Whether or not preserve a RevisionHistory for the federated object during updates.
-	Enabled bool `json:"enabled"`
-}
-
-// RolloutPlanConfig defines the configurations for the RolloutPlan feature.
-type RolloutPlanConfig struct {
-	// Whether or not to synchronize the rollout process across clusters.
-	Enabled bool `json:"enabled"`
-}
-
 // AutoMigrationConfig defines the configurations for the AutoMigration feature.
 type AutoMigrationConfig struct {
 	// Whether or not to automatically migrate unschedulable pods to a different cluster.

pkg/apis/core/v1alpha1/types_propgatedversion.go

@@ -30,15 +30,13 @@ import (
 // +kubebuilder:resource:path=propagatedversions
 // +kubebuilder:subresource:status
 
-// PropagatedVersion holds version information about the state
-// propagated from KubeFed APIs (configured by FederatedTypeConfig
-// resources) to member clusters. The name of a PropagatedVersion
-// encodes the kind and name of the resource it stores information for
-// (i.e. <lower-case kind>-<resource name>). If a target resource has
-// a populated metadata.Generation field, the generation will be
-// stored with a prefix of `gen:` as the version for the cluster.  If
-// metadata.Generation is not available, metadata.ResourceVersion will
-// be stored with a prefix of `rv:` as the version for the cluster.
+// PropagatedVersion holds version information about the state propagated from
+// FederatedObject to member clusters. The name of a PropagatedVersion is the
+// same as its FederatedObject. If a target resource has a populated
+// metadata.Generation field, the generation will be stored with a prefix of
+// `gen:` as the version for the cluster.  If metadata.Generation is not
+// available, metadata.ResourceVersion will be stored with a prefix of `rv:` as
+// the version for the cluster.
 type PropagatedVersion struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -71,7 +69,7 @@ type PropagatedVersionStatus struct {
 type ClusterObjectVersion struct {
 	// The name of the cluster the version is for.
 	ClusterName string `json:"clusterName"`
-	// The last version produced for the resource by a KubeFed
+	// The last version produced for the resource by a KubeAdmiral
 	// operation.
 	Version string `json:"version"`
 }
@@ -83,15 +81,13 @@ type ClusterObjectVersion struct {
 // +kubebuilder:resource:path=clusterpropagatedversions,scope=Cluster
 // +kubebuilder:subresource:status
 
-// ClusterPropagatedVersion holds version information about the state
-// propagated from KubeFed APIs (configured by FederatedTypeConfig
-// resources) to member clusters. The name of a ClusterPropagatedVersion
-// encodes the kind and name of the resource it stores information for
-// (i.e. <lower-case kind>-<resource name>). If a target resource has
-// a populated metadata.Generation field, the generation will be
-// stored with a prefix of `gen:` as the version for the cluster.  If
-// metadata.Generation is not available, metadata.ResourceVersion will
-// be stored with a prefix of `rv:` as the version for the cluster.
+// ClusterPropagatedVersion holds version information about the state propagated
+// from ClusterFederatedObject to member clusters. The name of a
+// ClusterPropagatedVersion is the same as its ClusterFederatedObject. If a
+// target resource has a populated metadata.Generation field, the generation
+// will be stored with a prefix of `gen:` as the version for the cluster.  If
+// metadata.Generation is not available, metadata.ResourceVersion will be stored
+// with a prefix of `rv:` as the version for the cluster.
 type ClusterPropagatedVersion struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`