refactor: many things

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

Author: arturshadnik

fleetconfig-controller/api/v1beta1/hub_types.go

@@ -223,7 +223,6 @@ type InstalledHubAddOn struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:resource:scope=Cluster
-// +kubebuilder:validation:XValidation:rule="self.metadata.name == 'hub'",message="Hub is a cluster singleton; name must be 'hub'"
 // +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

@@ -34,6 +34,10 @@ type SpokeSpec struct {
 	// +optional
 	CreateNamespace bool `json:"createNamespace,omitempty"`
 
+	// HubRef is a reference to the Hub that this Spoke is managed by.
+	// +required
+	HubRef HubRef `json:"hubRef"`
+
 	// If true, sync the labels from klusterlet to all agent resources.
 	// +optional
 	SyncLabels bool `json:"syncLabels,omitempty"`
@@ -64,12 +68,6 @@ type SpokeSpec struct {
 	// +optional
 	AddOns []AddOn `json:"addOns,omitempty"`
 
-	// The Spoke's RegistrationAuth is automatically managed by the controller. It will be inherited from the Hub's spec.registrationAuth field
-	// and should not be set when creating a spoke.
-	// +kubebuilder:default:={}
-	// +optional
-	RegistrationAuth RegistrationAuth `json:"registrationAuth,omitzero"`
-
 	// Timeout is the timeout in seconds for all clusteradm operations, including init, accept, join, upgrade, etc.
 	// +kubebuilder:default:=300
 	// +optional
@@ -82,6 +80,13 @@ type SpokeSpec struct {
 	LogVerbosity int `json:"logVerbosity,omitempty"`
 }
 
+// HubRef is the information required to get a Hub resource.
+type HubRef struct {
+	// Name is the name of the Hub that this Spoke is managed by.
+	// +required
+	Name string `json:"name"`
+}
+
 // Klusterlet is the configuration for a klusterlet.
 type Klusterlet struct {
 	// Annotations to apply to the spoke cluster. If not present, the 'agent.open-cluster-management.io/' prefix is added to each key.
@@ -138,13 +143,6 @@ type Klusterlet struct {
 	// +optional
 	Singleton bool `json:"singleton,omitempty"`
 
-	// Version and image registry details for the klusterlet. The Spoke's Source is automatically managed by the controller. It will be inherited from the Hub's
-	// spec.clusterManager.source field
-	// and should not be set when creating a spoke.
-	// +kubebuilder:default:={}
-	// +optional
-	Source OCMSource `json:"source,omitzero"`
-
 	// ValuesFrom is an optional reference to a ConfigMap containing values for the klusterlet Helm chart.
 	// optional
 	ValuesFrom *ConfigMapRef `json:"valuesFrom,omitempty"`
@@ -257,7 +255,7 @@ type SpokeStatus struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
-// +kubebuilder:resource:path=spokes,scope=Cluster
+// +kubebuilder:resource:path=spokes
 // +kubebuilder:printcolumn:name="PHASE",type=string,JSONPath=`.status.phase`
 // +kubebuilder:printcolumn:name="AGE",type=date,JSONPath=".metadata.creationTimestamp"
 

fleetconfig-controller/api/v1beta1/zz_generated.deepcopy.go

@@ -421,9 +421,6 @@ spec:
         required:
         - spec
         type: object
-        x-kubernetes-validations:
-        - message: Hub is a cluster singleton; name must be 'hub'
-          rule: self.metadata.name == 'hub'
     served: true
     storage: true
     subresources:

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

@@ -12,7 +12,7 @@ spec:
     listKind: SpokeList
     plural: spokes
     singular: spoke
-  scope: Cluster
+  scope: Namespaced
   versions:
   - additionalPrinterColumns:
     - jsonPath: .status.phase
@@ -79,6 +79,17 @@ spec:
                   If true, create open-cluster-management namespace and agent namespace (open-cluster-management-agent for Default mode,
                   <klusterlet-name> for Hosted mode), otherwise use existing one.
                 type: boolean
+              hubRef:
+                description: HubRef is a reference to the Hub that this Spoke is managed
+                  by.
+                properties:
+                  name:
+                    description: Name is the name of the Hub that this Spoke is managed
+                      by.
+                    type: string
+                required:
+                - name
+                type: object
               klusterlet:
                 default: {}
                 description: Klusterlet configuration.
@@ -206,25 +217,6 @@ spec:
                       If true, deploy klusterlet in singleton mode, with registration and work agents running in a single pod.
                       This is an alpha stage flag.
                     type: boolean
-                  source:
-                    default: {}
-                    description: |-
-                      Version and image registry details for the klusterlet. The Spoke's Source is automatically managed by the controller. It will be inherited from the Hub's
-                      spec.clusterManager.source field
-                      and should not be set when creating a spoke.
-                    properties:
-                      bundleVersion:
-                        default: default
-                        description: |-
-                          The version of predefined compatible image versions (e.g. v0.6.0). Defaults to the latest released version.
-                          You can also set "latest" to install the latest development version.
-                        type: string
-                      registry:
-                        default: quay.io/open-cluster-management
-                        description: The name of the image registry serving OCM images,
-                          which will be used for all OCM components."
-                        type: string
-                    type: object
                   values:
                     description: Values for the klusterlet Helm chart. Values defined
                       here override values which are defined in ValuesFrom.
@@ -2288,36 +2280,6 @@ spec:
                 description: URL of a forward proxy server used by agents to connect
                   to the Hub cluster.
                 type: string
-              registrationAuth:
-                default: {}
-                description: |-
-                  The Spoke's RegistrationAuth is automatically managed by the controller. It will be inherited from the Hub's spec.registrationAuth field
-                  and should not be set when creating a spoke.
-                properties:
-                  autoApprovedARNPatterns:
-                    description: |-
-                      List of AWS EKS ARN patterns so any EKS clusters with these patterns will be auto accepted to join with hub cluster.
-                      Example pattern: "arn:aws:eks:us-west-2:123456789013:cluster/.*"
-                    items:
-                      type: string
-                    type: array
-                  driver:
-                    default: csr
-                    description: |-
-                      The registration authentication driver to use.
-                      Options are:
-                       - csr: Use the default CSR-based registration authentication.
-                       - awsirsa: Use AWS IAM Role for Service Accounts (IRSA) registration authentication.
-                      The set of valid options is open for extension.
-                    enum:
-                    - csr
-                    - awsirsa
-                    type: string
-                  hubClusterARN:
-                    description: The Hub cluster ARN for awsirsa registration authentication.
-                      Required when Type is awsirsa, otherwise ignored.
-                    type: string
-                type: object
               syncLabels:
                 description: If true, sync the labels from klusterlet to all agent
                   resources.
@@ -2328,6 +2290,7 @@ spec:
                   operations, including init, accept, join, upgrade, etc.
                 type: integer
             required:
+            - hubRef
             - kubeconfig
             type: object
           status: