✨ Adding a new field to clustermanager API to pass list of aws tags to be added to aws resources (#358)

* Adding aa new field to clustermanager to pass list of aws tags to be added to aws resources

Signed-off-by: Gaurav Jaswal <[email protected]>

* move configuration to each driver struct

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

* standardizing registration driver names

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

---------

Signed-off-by: Gaurav Jaswal <[email protected]>
Signed-off-by: Alex <[email protected]>
Co-authored-by: Alex <[email protected]>

Author: jaswalkiranavtar

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

@@ -269,19 +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
-                            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
+                        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,16 +125,36 @@ type RegistrationDriverHub struct {
 	// +kubebuilder:validation:Enum=csr;awsirsa
 	AuthType string `json:"authType,omitempty"`
 
+	// CSR represents the configuration for csr driver.
+	// +optional
+	CSR *CSRConfig `json:"csr,omitempty"`
+
+	// AwsIrsa represents the configuration for awsisra driver.
+	// +optional
+	AwsIrsa *AwsIrsaConfig `json:"awsisra,omitempty"`
+}
+
+type CSRConfig 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
+	// Example - "product:v1:tenant:app-name=My-App"
+	// +optional
+	Tags []string `json:"tags,omitempty"`
 }
 
 type WorkConfiguration struct {

operator/v1/zz_generated.deepcopy.go

@@ -271,8 +271,10 @@ var _ = Describe("ClusterManager API test with RegistrationConfiguration", func(
 				RegistrationConfiguration: &operatorv1.RegistrationHubConfiguration{
 					RegistrationDrivers: []operatorv1.RegistrationDriverHub{
 						{
-							AuthType:      "awsirsa",
-							HubClusterArn: "arn:aws:bks:us-west-2:123456789012:cluster/hub-cluster1",
+							AuthType: "awsirsa",
+							AwsIrsa: &operatorv1.AwsIrsaConfig{
+								HubClusterArn: "arn:aws:bks:us-west-2:123456789012:cluster/hub-cluster1",
+							},
 						},
 					},
 				},
@@ -291,8 +293,10 @@ var _ = Describe("ClusterManager API test with RegistrationConfiguration", func(
 				RegistrationConfiguration: &operatorv1.RegistrationHubConfiguration{
 					RegistrationDrivers: []operatorv1.RegistrationDriverHub{
 						{
-							AuthType:      "awsirsa",
-							HubClusterArn: "arn:aws:eks:us-west-2:123456789012:cluster/hub-cluster1",
+							AuthType: "awsirsa",
+							AwsIrsa: &operatorv1.AwsIrsaConfig{
+								HubClusterArn: "arn:aws:eks:us-west-2:123456789012:cluster/hub-cluster1",
+							},
 						},
 					},
 				},