Changing the config to go under already existing registrationConfigur…

…ation
open-cluster-management-io · Aug 21, 2024 · 2514dad · 2514dad
1 parent d22ac83
commit 2514dad
Showing 1 changed file with 17 additions and 21 deletions.
diff --git a/crdsv1beta1/0001_00_operator.open-cluster-management.io_klusterlets.crd.yaml b/crdsv1beta1/0001_00_operator.open-cluster-management.io_klusterlets.crd.yaml
@@ -35,27 +35,6 @@ spec:
               type: string
               maxLength: 63
               pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?$
-            registrationConfiguration:
-              description: RegistrationConfiguration provides registration configuration details required to join to hub cluster
-              type: object
-              properties:
-                registrationDriver:
-                description: This provides details required for the registration driver for hub cluster
-                type: object
-                  authType: 
-                    description: The authType can be either awsIrsa or CSR. Default value will be CSR. Please use the value awsIrsa for aws IAM based authentication for EKS clusters since they don`t support CSR based authentication.
-                    type: string
-                    default: csr
-                    enum:
-                      - csr
-                      - awsirsa
-                  awsIrsa:
-                    description: AwsIrsa contains the details required for awsIrsa registration. These are required only when the authType is awsIRSA
-                    type: object
-                    properties:
-                      eksHubClusterArn: 
-                        description: AWS arn of the EKS hub cluster. This will be required to create IAM identities. Example - arn:eks:us-west-2:12345678910:cluster/hub 
-                        type: string
             deployOption:
               description: DeployOption contains the options of deploying a klusterlet
               type: object
@@ -139,6 +118,23 @@ spec:
               description: RegistrationConfiguration contains the configuration of registration
               type: object
               properties:
+                registrationDriver:
+                  description: This provides driver details required to register with hub
+                  type: object
+                    authType: 
+                      description: The authType is type of the authentication used by managedcluster to register as well as pull work from hub. Possible values are csr and awsirsa
+                      type: string
+                      default: csr
+                      enum:
+                        - csr
+                        - awsirsa
+                    awsIrsa:
+                      description: awsIrsa contains the details required for registering with eks hub cluster using IAM roles for service account. This is required only when the authType is awsirsa
+                      type: object
+                      properties:
+                        eksHubClusterArn: 
+                          description: The arn of the EKS hub cluster. This will be required to pass information to hub, which hub will use to create IAM identities for this klusterlet. Example - arn:eks:us-west-2:12345678910:cluster/hub-cluster1 
+                          type: string
                 bootstrapKubeConfigs:
                   description: "BootstrapKubeConfigs defines the ordered list of bootstrap kubeconfigs. The order decides which bootstrap kubeconfig to use first when rebootstrap. \n When the agent loses the connection to the current hub over HubConnectionTimeoutSeconds, or the managedcluster CR is set `hubAcceptsClient=false` on the hub, the controller marks the related bootstrap kubeconfig as \"failed\". \n A failed bootstrapkubeconfig won't be used for the duration specified by SkipFailedBootstrapKubeConfigSeconds. But if the user updates the content of a failed bootstrapkubeconfig, the \"failed\" mark will be cleared."
                   type: object