Merge pull request #121 from awslabs/name-id

Change resource entrypoint from `name` to `id`
kro-run · Nov 11, 2024 · 043be06 · 043be06
2 parents 2e15201 + 6f7b4ca
commit 043be06
Show file tree

Hide file tree

Showing 42 changed files with 319 additions and 319 deletions.
diff --git a/api/v1alpha1/resource_group.go b/api/v1alpha1/resource_group.go
@@ -81,7 +81,7 @@ type Validation struct {
 
 type Resource struct {
 	// +kubebuilder:validation:Required
-	Name string `json:"name,omitempty"`
+	ID string `json:"id,omitempty"`
 	// +kubebuilder:validation:Required
 	Template runtime.RawExtension `json:"template,omitempty"`
 	// +kubebuilder:validation:Optional

diff --git a/config/crd/bases/kro.run_resourcegroups.yaml b/config/crd/bases/kro.run_resourcegroups.yaml
@@ -71,12 +71,12 @@ spec:
                 description: The resources that are part of the resourcegroup.
                 items:
                   properties:
+                    id:
+                      type: string
                     includeWhen:
                       items:
                         type: string
                       type: array
-                    name:
-                      type: string
                     readyWhen:
                       items:
                         type: string
@@ -85,7 +85,7 @@ spec:
                       type: object
                       x-kubernetes-preserve-unknown-fields: true
                   required:
-                  - name
+                  - id
                   - template
                   type: object
                 type: array

diff --git a/examples/ack-controller/ec2-controller/ec2-controller.yaml b/examples/ack-controller/ec2-controller/ec2-controller.yaml
@@ -37,15 +37,15 @@ spec:
         serviceAccount:
           name: string | default=ec2-controller-sa
   resources:
-  - name: ec2CRDGroup
+  - id: ec2CRDGroup
     template:
       apiVersion: kro.run/v1alpha1
       kind: EC2CRDGroup
       metadata:
         name: ${schema.spec.name}-crd-group
       spec:
         name: ${schema.spec.name}-crd-group
-  - name: ec2ControllerIamRole
+  - id: ec2ControllerIamRole
     template:
       apiVersion: iam.services.k8s.aws/v1alpha1
       kind: Role
@@ -70,7 +70,7 @@ spec:
               }
             }]
           }
-  - name: serviceAccount
+  - id: serviceAccount
     template:
       apiVersion: v1
       kind: ServiceAccount
@@ -79,7 +79,7 @@ spec:
         namespace: ${schema.spec.namespace}
         annotations:
           eks.amazonaws.com/role-arn: ${ec2ControllerIamRole.status.ackResourceMetadata.arn}
-  - name: deployment
+  - id: deployment
     template:
       apiVersion: apps/v1
       kind: Deployment
@@ -138,7 +138,7 @@ spec:
                 value: ${schema.spec.values.log.level}              
               ports:
               - containerPort: 80
-  - name: clusterRoleBinding
+  - id: clusterRoleBinding
     template:
       apiVersion: rbac.authorization.k8s.io/v1
       kind: ClusterRoleBinding
@@ -152,7 +152,7 @@ spec:
       - kind: ServiceAccount
         name: ${serviceAccount.metadata.name}
         namespace: ${serviceAccount.metadata.namespace}
-  - name: clusterRole
+  - id: clusterRole
     template:
       apiVersion: rbac.authorization.k8s.io/v1
       kind: ClusterRole

diff --git a/examples/ack-controller/ec2-controller/ec2-crd-group.yaml b/examples/ack-controller/ec2-controller/ec2-crd-group.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       name: string | default=ec2CRDGroup
   resources:
-  - name: dhcpOptionsCRD
+  - id: dhcpOptionsCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -192,7 +192,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: elasticIPAddressCRD
+  - id: elasticIPAddressCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -378,7 +378,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: flowLogsCRD
+  - id: flowLogsCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -645,7 +645,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: instanceCRD
+  - id: instanceCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -1525,7 +1525,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: internetGatewayCRD
+  - id: internetGatewayCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -1727,7 +1727,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: natGatewayCRD
+  - id: natGatewayCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -2029,7 +2029,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: networkAclCRD
+  - id: networkAclCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -2265,7 +2265,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: routeTableCRD
+  - id: routeTableCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -2611,7 +2611,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: securityGroupCRD
+  - id: securityGroupCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -3039,7 +3039,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: subnetCRD
+  - id: subnetCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -3351,7 +3351,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: transitGatewayCRD
+  - id: transitGatewayCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -3533,7 +3533,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: vpcEndpointCRD
+  - id: vpcEndpointCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -3876,7 +3876,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: vpcEndpointServiceConfigurationCRD
+  - id: vpcEndpointServiceConfigurationCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -4103,7 +4103,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: vpcPeeringConnectionCRD
+  - id: vpcPeeringConnectionCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -4431,7 +4431,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: vpcCRD
+  - id: vpcCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -4723,7 +4723,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: adoptedResourceCRD
+  - id: adoptedResourceCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -4978,7 +4978,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: fieldExportCRD
+  - id: fieldExportCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition

diff --git a/examples/ack-controller/eks-controller/eks-controller.yaml b/examples/ack-controller/eks-controller/eks-controller.yaml
@@ -40,15 +40,15 @@ spec:
         serviceAccount:
           name: string | default=eks-controller-sa
   resources:
-  - name: eksCRDGroup
+  - id: eksCRDGroup
     template:
       apiVersion: kro.run/v1alpha1
       kind: EKSCRDGroup
       metadata:
         name: ${schema.spec.name}-crd-group
       spec:
         name: ${schema.spec.name}-crd-group
-  - name: eksControllerIamPolicy
+  - id: eksControllerIamPolicy
     template:
       apiVersion: iam.services.k8s.aws/v1alpha1
       kind: Policy
@@ -75,7 +75,7 @@ spec:
               }
             ]
           }
-  - name: eksControllerIamRole
+  - id: eksControllerIamRole
     template:
       apiVersion: iam.services.k8s.aws/v1alpha1
       kind: Role
@@ -100,7 +100,7 @@ spec:
               }
             }]
           }
-  - name: serviceAccount
+  - id: serviceAccount
     template:
       apiVersion: v1
       kind: ServiceAccount
@@ -109,7 +109,7 @@ spec:
         namespace: ${schema.spec.namespace}
         annotations:
           eks.amazonaws.com/role-arn : ${eksControllerIamRole.status.ackResourceMetadata.arn}
-  - name: deployment
+  - id: deployment
     template:
       apiVersion: apps/v1
       kind: Deployment
@@ -168,7 +168,7 @@ spec:
                 value: ${schema.spec.values.log.level}              
               ports:
               - containerPort: 80
-  - name: clusterRoleBinding
+  - id: clusterRoleBinding
     template:
       apiVersion: rbac.authorization.k8s.io/v1
       kind: ClusterRoleBinding
@@ -182,7 +182,7 @@ spec:
       - kind: ServiceAccount
         name: ${serviceAccount.metadata.name}
         namespace: ${serviceAccount.metadata.namespace}
-  - name: clusterRole
+  - id: clusterRole
     template:
       apiVersion: rbac.authorization.k8s.io/v1
       kind: ClusterRole

diff --git a/examples/ack-controller/eks-controller/eks-crd-group.yaml b/examples/ack-controller/eks-controller/eks-crd-group.yaml
@@ -9,7 +9,7 @@ spec:
     spec:
       name: string | default=eksCRDGroup
   resources:
-  - name: accessEntryCRD
+  - id: accessEntryCRD
     template: 
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -273,7 +273,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: addonsCRD
+  - id: addonsCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -592,7 +592,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: clusterCRD
+  - id: clusterCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -1028,7 +1028,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: fargateProfilesCRD
+  - id: fargateProfilesCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -1279,7 +1279,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: identityProviderCRD
+  - id: identityProviderCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -1456,7 +1456,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: nodeGroupsCRD
+  - id: nodeGroupsCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition
@@ -1929,7 +1929,7 @@ spec:
           storage: true
           subresources:
             status: {}
-  - name: podIdentityAssociationCRD
+  - id: podIdentityAssociationCRD
     template:
       apiVersion: apiextensions.k8s.io/v1
       kind: CustomResourceDefinition