move configuration to each driver struct

Signed-off-by: Alex <[email protected]>

Author: alex0chan

operator/v1/0000_01_operator.open-cluster-management.io_clustermanagers.crd.yaml

@@ -269,27 +269,40 @@ spec:
                           - csr
                           - awsirsa
                           type: string
-                        autoApprovedIdentities:
-                          description: |-
-                            For csr authentication type, AutoApprovedIdentities represent a list of approved users
-                            For awsirsa authentication type, AutoApprovedIdentities represent a list of approved arn patterns
-                          items:
-                            type: string
-                          type: array
-                        hubClusterArn:
-                          description: |-
-                            This represents the hub cluster ARN. Applicable to only awsirsa authentication type.
-                            Example - arn:eks:us-west-2:12345678910:cluster/hub-cluster1
-                          pattern: ^arn:aws:eks:([a-zA-Z0-9-]+):(\d{12}):cluster/([a-zA-Z0-9-]+)$
-                          type: string
-                        tags:
-                          description: |-
-                            List of tags to be added to AWS resources created by hub while processing awsirsa registration request.
-                            Applicable to only awsirsa authentication type.
-                            Example - "product:v1:tenant:app-name=My-App"
-                          items:
-                            type: string
-                          type: array
+                        awsisra:
+                          description: AwsIrsa represents the configuration for awsisra
+                            driver.
+                          properties:
+                            autoApprovedIdentities:
+                              description: AutoApprovedIdentities represent a list
+                                of approved arn patterns
+                              items:
+                                type: string
+                              type: array
+                            hubClusterArn:
+                              description: |-
+                                This represents the hub cluster ARN
+                                Example - arn:eks:us-west-2:12345678910:cluster/hub-cluster1
+                              pattern: ^arn:aws:eks:([a-zA-Z0-9-]+):(\d{12}):cluster/([a-zA-Z0-9-]+)$
+                              type: string
+                            tags:
+                              description: |-
+                                List of tags to be added to AWS resources created by hub while processing awsirsa registration request
+                                Example - "product:v1:tenant:app-name=My-App"
+                              items:
+                                type: string
+                              type: array
+                          type: object
+                        csr:
+                          description: CSR represents the configuration for csr driver.
+                          properties:
+                            autoApprovedIdentities:
+                              description: AutoApprovedIdentities represent a list
+                                of approved users
+                              items:
+                                type: string
+                              type: array
+                          type: object
                       type: object
                     type: array
                     x-kubernetes-list-map-keys:

operator/v1/types_clustermanager.go

@@ -125,19 +125,33 @@ type RegistrationDriverHub struct {
 	// +kubebuilder:validation:Enum=csr;awsirsa
 	AuthType string `json:"authType,omitempty"`
 
-	// This represents the hub cluster ARN. Applicable to only awsirsa authentication type.
+	// CSR represents the configuration for csr driver.
+	// +optional
+	CSR *CSRDriverConfig `json:"csr,omitempty"`
+
+	// AwsIrsa represents the configuration for awsisra driver.
+	// +optional
+	AwsIrsa *AwsIrsaConfig `json:"awsisra,omitempty"`
+}
+
+type CSRDriverConfig struct {
+	// AutoApprovedIdentities represent a list of approved users
+	// +optional
+	AutoApprovedIdentities []string `json:"autoApprovedIdentities,omitempty"`
+}
+
+type AwsIrsaConfig struct {
+	// This represents the hub cluster ARN
 	// Example - arn:eks:us-west-2:12345678910:cluster/hub-cluster1
 	// +optional
 	// +kubebuilder:validation:Pattern=`^arn:aws:eks:([a-zA-Z0-9-]+):(\d{12}):cluster/([a-zA-Z0-9-]+)$`
 	HubClusterArn string `json:"hubClusterArn,omitempty"`
 
-	// For csr authentication type, AutoApprovedIdentities represent a list of approved users
-	// For awsirsa authentication type, AutoApprovedIdentities represent a list of approved arn patterns
+	// AutoApprovedIdentities represent a list of approved arn patterns
 	// +optional
 	AutoApprovedIdentities []string `json:"autoApprovedIdentities,omitempty"`
 
-	// List of tags to be added to AWS resources created by hub while processing awsirsa registration request.
-	// Applicable to only awsirsa authentication type.
+	// List of tags to be added to AWS resources created by hub while processing awsirsa registration request
 	// Example - "product:v1:tenant:app-name=My-App"
 	// +optional
 	Tags []string `json:"tags,omitempty"`