feat: namespaced hub

Signed-off-by: Artur Shad Nik <arturshadnik@gmail.com>

Author: arturshadnik

fleetconfig-controller/api/v1beta1/hub_types.go

@@ -222,7 +222,6 @@ type InstalledHubAddOn struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:scope=Cluster
 // +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.phase`
 // +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 

fleetconfig-controller/api/v1beta1/spoke_types.go

@@ -69,13 +69,13 @@ type SpokeSpec struct {
 	AddOns []AddOn `json:"addOns,omitempty"`
 
 	// Timeout is the timeout in seconds for all clusteradm operations, including init, accept, join, upgrade, etc.
-	// +kubebuilder:default:=300
+	// If not set, defaults to the Hub's timeout.
 	// +optional
 	Timeout int `json:"timeout,omitempty"`
 
 	// LogVerbosity is the verbosity of the logs.
+	// If not set, defaults to the Hub's logVerbosity.
 	// +kubebuilder:validation:Enum=0;1;2;3;4;5;6;7;8;9;10
-	// +kubebuilder:default:=0
 	// +optional
 	LogVerbosity int `json:"logVerbosity,omitempty"`
 }
@@ -85,6 +85,15 @@ type HubRef struct {
 	// Name is the name of the Hub that this Spoke is managed by.
 	// +required
 	Name string `json:"name"`
+
+	// Namespace is namespace of the Hub that this Spoke is managed by.
+	// +required
+	Namespace string `json:"namespace"`
+}
+
+// IsManagedBy checks whether or not the Spoke is managed by a particular Hub.
+func (s *Spoke) IsManagedBy(om metav1.ObjectMeta) bool {
+	return s.Spec.HubRef.Name == om.Name && s.Spec.HubRef.Namespace == om.Namespace
 }
 
 // Klusterlet is the configuration for a klusterlet.

fleetconfig-controller/charts/fleetconfig-controller/crds/fleetconfig.open-cluster-management.io_hubs.yaml

@@ -12,7 +12,7 @@ spec:
     listKind: HubList
     plural: hubs
     singular: hub
-  scope: Cluster
+  scope: Namespaced
   versions:
   - additionalPrinterColumns:
     - jsonPath: .status.phase

fleetconfig-controller/charts/fleetconfig-controller/crds/fleetconfig.open-cluster-management.io_spokes.yaml

@@ -87,8 +87,13 @@ spec:
                     description: Name is the name of the Hub that this Spoke is managed
                       by.
                     type: string
+                  namespace:
+                    description: Namespace is namespace of the Hub that this Spoke
+                      is managed by.
+                    type: string
                 required:
                 - name
+                - namespace
                 type: object
               klusterlet:
                 default: {}
@@ -2214,9 +2219,11 @@ spec:
                     properties:
                       key:
                         description: Key is the key under which the data is stored.
+                        minLength: 1
                         type: string
                       name:
                         description: Name is the name of the ConfigMap
+                        minLength: 1
                         type: string
                     required:
                     - key
@@ -2258,8 +2265,9 @@ spec:
                     type: object
                 type: object
               logVerbosity:
-                default: 0
-                description: LogVerbosity is the verbosity of the logs.
+                description: |-
+                  LogVerbosity is the verbosity of the logs.
+                  If not set, defaults to the Hub's logVerbosity.
                 enum:
                 - 0
                 - 1
@@ -2285,9 +2293,9 @@ spec:
                   resources.
                 type: boolean
               timeout:
-                default: 300
-                description: Timeout is the timeout in seconds for all clusteradm
-                  operations, including init, accept, join, upgrade, etc.
+                description: |-
+                  Timeout is the timeout in seconds for all clusteradm operations, including init, accept, join, upgrade, etc.
+                  If not set, defaults to the Hub's timeout.
                 type: integer
             required:
             - hubRef

fleetconfig-controller/internal/controller/v1beta1/hub_controller.go

@@ -196,7 +196,10 @@ func (r *HubReconciler) cleanHub(ctx context.Context, hub *v1beta1.Hub) error {
 		// Mark all Spokes for deletion if they haven't been deleted yet
 		for i := range spokes {
 			spoke := &spokes[i]
-			if spoke.DeletionTimestamp.IsZero() && spoke.Spec.HubRef.Name == hub.Name {
+			if spoke.DeletionTimestamp.IsZero() {
+				if !spoke.IsManagedBy(hub.ObjectMeta) {
+					continue
+				}
 				logger.Info("Marking Spoke for deletion", "spoke", spoke.Name)
 				if err := r.Delete(ctx, spoke); err != nil && !kerrs.IsNotFound(err) {
 					return fmt.Errorf("failed to delete spoke %s: %w", spoke.Name, err)
@@ -548,7 +551,8 @@ func (r *HubReconciler) mapSpokeEventToHub(_ context.Context, obj client.Object)
 	return []reconcile.Request{
 		{
 			NamespacedName: types.NamespacedName{
-				Name: spoke.Spec.HubRef.Name,
+				Name:      spoke.Spec.HubRef.Name,
+				Namespace: spoke.Spec.HubRef.Namespace,
 			},
 		},
 	}

fleetconfig-controller/internal/controller/v1beta1/spoke_controller.go

@@ -784,7 +784,7 @@ func getToken(ctx context.Context, kClient client.Client, hub *v1beta1.Hub) (*to
 func (r *SpokeReconciler) getHubMeta(ctx context.Context, hubRef v1beta1.HubRef) (*v1beta1.Hub, []byte, error) {
 	hub := &v1beta1.Hub{}
 	var hubKubeconfig []byte
-	nn := types.NamespacedName{Name: hubRef.Name}
+	nn := types.NamespacedName{Name: hubRef.Name, Namespace: hubRef.Namespace}
 
 	// get Hub using local client
 	err := r.Get(ctx, nn, hub)
@@ -944,7 +944,7 @@ func (r *SpokeReconciler) mapHubEventToSpoke(ctx context.Context, obj client.Obj
 	}
 	req := make([]reconcile.Request, 0)
 	for _, s := range spokeList.Items {
-		if s.Spec.HubRef.Name != hub.Name {
+		if !s.IsManagedBy(hub.ObjectMeta) {
 			continue
 		}
 		req = append(req, reconcile.Request{

fleetconfig-controller/internal/webhook/v1beta1/spoke_webhook.go

@@ -79,11 +79,14 @@ func (d *SpokeCustomDefaulter) Default(ctx context.Context, obj runtime.Object)
 	}
 
 	// only set these if they are unset, to allow per-resource values
-	if spoke.Spec.Timeout == 300 { // default value
-		spoke.Spec.Timeout = hub.Spec.DeepCopy().Timeout
+	// Note: We can't distinguish between default values and explicitly set values
+	// since kubebuilder defaults are applied before webhooks run.
+	// So we only default from Hub if the Spoke has the kubebuilder default values.
+	if spoke.Spec.Timeout == 0 {
+		spoke.Spec.Timeout = hub.Spec.Timeout
 	}
 	if spoke.Spec.LogVerbosity == 0 {
-		spoke.Spec.LogVerbosity = hub.Spec.DeepCopy().LogVerbosity
+		spoke.Spec.LogVerbosity = hub.Spec.LogVerbosity
 	}
 	return nil
 }