Skip to content

Commit 043be06

Browse files
a-hilalya-hilaly
authored
Merge pull request #121 from awslabs/name-id
Change resource entrypoint from `name` to `id`
2 parents 2e15201 + 6f7b4ca commit 043be06

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+319
-319
lines changed

‎api/v1alpha1/resource_group.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ type Validation struct {
8181

8282
type Resource struct {
8383
// +kubebuilder:validation:Required
84-
Name string `json:"name,omitempty"`
84+
ID string `json:"id,omitempty"`
8585
// +kubebuilder:validation:Required
8686
Template runtime.RawExtension `json:"template,omitempty"`
8787
// +kubebuilder:validation:Optional

‎config/crd/bases/kro.run_resourcegroups.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ spec:
7171
description: The resources that are part of the resourcegroup.
7272
items:
7373
properties:
74+
id:
75+
type: string
7476
includeWhen:
7577
items:
7678
type: string
7779
type: array
78-
name:
79-
type: string
8080
readyWhen:
8181
items:
8282
type: string
@@ -85,7 +85,7 @@ spec:
8585
type: object
8686
x-kubernetes-preserve-unknown-fields: true
8787
required:
88-
- name
88+
- id
8989
- template
9090
type: object
9191
type: array

‎examples/ack-controller/ec2-controller/ec2-controller.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ spec:
3737
serviceAccount:
3838
name: string | default=ec2-controller-sa
3939
resources:
40-
- name: ec2CRDGroup
40+
- id: ec2CRDGroup
4141
template:
4242
apiVersion: kro.run/v1alpha1
4343
kind: EC2CRDGroup
4444
metadata:
4545
name: ${schema.spec.name}-crd-group
4646
spec:
4747
name: ${schema.spec.name}-crd-group
48-
- name: ec2ControllerIamRole
48+
- id: ec2ControllerIamRole
4949
template:
5050
apiVersion: iam.services.k8s.aws/v1alpha1
5151
kind: Role
@@ -70,7 +70,7 @@ spec:
7070
}
7171
}]
7272
}
73-
- name: serviceAccount
73+
- id: serviceAccount
7474
template:
7575
apiVersion: v1
7676
kind: ServiceAccount
@@ -79,7 +79,7 @@ spec:
7979
namespace: ${schema.spec.namespace}
8080
annotations:
8181
eks.amazonaws.com/role-arn: ${ec2ControllerIamRole.status.ackResourceMetadata.arn}
82-
- name: deployment
82+
- id: deployment
8383
template:
8484
apiVersion: apps/v1
8585
kind: Deployment
@@ -138,7 +138,7 @@ spec:
138138
value: ${schema.spec.values.log.level}
139139
ports:
140140
- containerPort: 80
141-
- name: clusterRoleBinding
141+
- id: clusterRoleBinding
142142
template:
143143
apiVersion: rbac.authorization.k8s.io/v1
144144
kind: ClusterRoleBinding
@@ -152,7 +152,7 @@ spec:
152152
- kind: ServiceAccount
153153
name: ${serviceAccount.metadata.name}
154154
namespace: ${serviceAccount.metadata.namespace}
155-
- name: clusterRole
155+
- id: clusterRole
156156
template:
157157
apiVersion: rbac.authorization.k8s.io/v1
158158
kind: ClusterRole

‎examples/ack-controller/ec2-controller/ec2-crd-group.yaml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ spec:
99
spec:
1010
name: string | default=ec2CRDGroup
1111
resources:
12-
- name: dhcpOptionsCRD
12+
- id: dhcpOptionsCRD
1313
template:
1414
apiVersion: apiextensions.k8s.io/v1
1515
kind: CustomResourceDefinition
@@ -192,7 +192,7 @@ spec:
192192
storage: true
193193
subresources:
194194
status: {}
195-
- name: elasticIPAddressCRD
195+
- id: elasticIPAddressCRD
196196
template:
197197
apiVersion: apiextensions.k8s.io/v1
198198
kind: CustomResourceDefinition
@@ -378,7 +378,7 @@ spec:
378378
storage: true
379379
subresources:
380380
status: {}
381-
- name: flowLogsCRD
381+
- id: flowLogsCRD
382382
template:
383383
apiVersion: apiextensions.k8s.io/v1
384384
kind: CustomResourceDefinition
@@ -645,7 +645,7 @@ spec:
645645
storage: true
646646
subresources:
647647
status: {}
648-
- name: instanceCRD
648+
- id: instanceCRD
649649
template:
650650
apiVersion: apiextensions.k8s.io/v1
651651
kind: CustomResourceDefinition
@@ -1525,7 +1525,7 @@ spec:
15251525
storage: true
15261526
subresources:
15271527
status: {}
1528-
- name: internetGatewayCRD
1528+
- id: internetGatewayCRD
15291529
template:
15301530
apiVersion: apiextensions.k8s.io/v1
15311531
kind: CustomResourceDefinition
@@ -1727,7 +1727,7 @@ spec:
17271727
storage: true
17281728
subresources:
17291729
status: {}
1730-
- name: natGatewayCRD
1730+
- id: natGatewayCRD
17311731
template:
17321732
apiVersion: apiextensions.k8s.io/v1
17331733
kind: CustomResourceDefinition
@@ -2029,7 +2029,7 @@ spec:
20292029
storage: true
20302030
subresources:
20312031
status: {}
2032-
- name: networkAclCRD
2032+
- id: networkAclCRD
20332033
template:
20342034
apiVersion: apiextensions.k8s.io/v1
20352035
kind: CustomResourceDefinition
@@ -2265,7 +2265,7 @@ spec:
22652265
storage: true
22662266
subresources:
22672267
status: {}
2268-
- name: routeTableCRD
2268+
- id: routeTableCRD
22692269
template:
22702270
apiVersion: apiextensions.k8s.io/v1
22712271
kind: CustomResourceDefinition
@@ -2611,7 +2611,7 @@ spec:
26112611
storage: true
26122612
subresources:
26132613
status: {}
2614-
- name: securityGroupCRD
2614+
- id: securityGroupCRD
26152615
template:
26162616
apiVersion: apiextensions.k8s.io/v1
26172617
kind: CustomResourceDefinition
@@ -3039,7 +3039,7 @@ spec:
30393039
storage: true
30403040
subresources:
30413041
status: {}
3042-
- name: subnetCRD
3042+
- id: subnetCRD
30433043
template:
30443044
apiVersion: apiextensions.k8s.io/v1
30453045
kind: CustomResourceDefinition
@@ -3351,7 +3351,7 @@ spec:
33513351
storage: true
33523352
subresources:
33533353
status: {}
3354-
- name: transitGatewayCRD
3354+
- id: transitGatewayCRD
33553355
template:
33563356
apiVersion: apiextensions.k8s.io/v1
33573357
kind: CustomResourceDefinition
@@ -3533,7 +3533,7 @@ spec:
35333533
storage: true
35343534
subresources:
35353535
status: {}
3536-
- name: vpcEndpointCRD
3536+
- id: vpcEndpointCRD
35373537
template:
35383538
apiVersion: apiextensions.k8s.io/v1
35393539
kind: CustomResourceDefinition
@@ -3876,7 +3876,7 @@ spec:
38763876
storage: true
38773877
subresources:
38783878
status: {}
3879-
- name: vpcEndpointServiceConfigurationCRD
3879+
- id: vpcEndpointServiceConfigurationCRD
38803880
template:
38813881
apiVersion: apiextensions.k8s.io/v1
38823882
kind: CustomResourceDefinition
@@ -4103,7 +4103,7 @@ spec:
41034103
storage: true
41044104
subresources:
41054105
status: {}
4106-
- name: vpcPeeringConnectionCRD
4106+
- id: vpcPeeringConnectionCRD
41074107
template:
41084108
apiVersion: apiextensions.k8s.io/v1
41094109
kind: CustomResourceDefinition
@@ -4431,7 +4431,7 @@ spec:
44314431
storage: true
44324432
subresources:
44334433
status: {}
4434-
- name: vpcCRD
4434+
- id: vpcCRD
44354435
template:
44364436
apiVersion: apiextensions.k8s.io/v1
44374437
kind: CustomResourceDefinition
@@ -4723,7 +4723,7 @@ spec:
47234723
storage: true
47244724
subresources:
47254725
status: {}
4726-
- name: adoptedResourceCRD
4726+
- id: adoptedResourceCRD
47274727
template:
47284728
apiVersion: apiextensions.k8s.io/v1
47294729
kind: CustomResourceDefinition
@@ -4978,7 +4978,7 @@ spec:
49784978
storage: true
49794979
subresources:
49804980
status: {}
4981-
- name: fieldExportCRD
4981+
- id: fieldExportCRD
49824982
template:
49834983
apiVersion: apiextensions.k8s.io/v1
49844984
kind: CustomResourceDefinition

‎examples/ack-controller/eks-controller/eks-controller.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ spec:
4040
serviceAccount:
4141
name: string | default=eks-controller-sa
4242
resources:
43-
- name: eksCRDGroup
43+
- id: eksCRDGroup
4444
template:
4545
apiVersion: kro.run/v1alpha1
4646
kind: EKSCRDGroup
4747
metadata:
4848
name: ${schema.spec.name}-crd-group
4949
spec:
5050
name: ${schema.spec.name}-crd-group
51-
- name: eksControllerIamPolicy
51+
- id: eksControllerIamPolicy
5252
template:
5353
apiVersion: iam.services.k8s.aws/v1alpha1
5454
kind: Policy
@@ -75,7 +75,7 @@ spec:
7575
}
7676
]
7777
}
78-
- name: eksControllerIamRole
78+
- id: eksControllerIamRole
7979
template:
8080
apiVersion: iam.services.k8s.aws/v1alpha1
8181
kind: Role
@@ -100,7 +100,7 @@ spec:
100100
}
101101
}]
102102
}
103-
- name: serviceAccount
103+
- id: serviceAccount
104104
template:
105105
apiVersion: v1
106106
kind: ServiceAccount
@@ -109,7 +109,7 @@ spec:
109109
namespace: ${schema.spec.namespace}
110110
annotations:
111111
eks.amazonaws.com/role-arn : ${eksControllerIamRole.status.ackResourceMetadata.arn}
112-
- name: deployment
112+
- id: deployment
113113
template:
114114
apiVersion: apps/v1
115115
kind: Deployment
@@ -168,7 +168,7 @@ spec:
168168
value: ${schema.spec.values.log.level}
169169
ports:
170170
- containerPort: 80
171-
- name: clusterRoleBinding
171+
- id: clusterRoleBinding
172172
template:
173173
apiVersion: rbac.authorization.k8s.io/v1
174174
kind: ClusterRoleBinding
@@ -182,7 +182,7 @@ spec:
182182
- kind: ServiceAccount
183183
name: ${serviceAccount.metadata.name}
184184
namespace: ${serviceAccount.metadata.namespace}
185-
- name: clusterRole
185+
- id: clusterRole
186186
template:
187187
apiVersion: rbac.authorization.k8s.io/v1
188188
kind: ClusterRole

‎examples/ack-controller/eks-controller/eks-crd-group.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ spec:
99
spec:
1010
name: string | default=eksCRDGroup
1111
resources:
12-
- name: accessEntryCRD
12+
- id: accessEntryCRD
1313
template:
1414
apiVersion: apiextensions.k8s.io/v1
1515
kind: CustomResourceDefinition
@@ -273,7 +273,7 @@ spec:
273273
storage: true
274274
subresources:
275275
status: {}
276-
- name: addonsCRD
276+
- id: addonsCRD
277277
template:
278278
apiVersion: apiextensions.k8s.io/v1
279279
kind: CustomResourceDefinition
@@ -592,7 +592,7 @@ spec:
592592
storage: true
593593
subresources:
594594
status: {}
595-
- name: clusterCRD
595+
- id: clusterCRD
596596
template:
597597
apiVersion: apiextensions.k8s.io/v1
598598
kind: CustomResourceDefinition
@@ -1028,7 +1028,7 @@ spec:
10281028
storage: true
10291029
subresources:
10301030
status: {}
1031-
- name: fargateProfilesCRD
1031+
- id: fargateProfilesCRD
10321032
template:
10331033
apiVersion: apiextensions.k8s.io/v1
10341034
kind: CustomResourceDefinition
@@ -1279,7 +1279,7 @@ spec:
12791279
storage: true
12801280
subresources:
12811281
status: {}
1282-
- name: identityProviderCRD
1282+
- id: identityProviderCRD
12831283
template:
12841284
apiVersion: apiextensions.k8s.io/v1
12851285
kind: CustomResourceDefinition
@@ -1456,7 +1456,7 @@ spec:
14561456
storage: true
14571457
subresources:
14581458
status: {}
1459-
- name: nodeGroupsCRD
1459+
- id: nodeGroupsCRD
14601460
template:
14611461
apiVersion: apiextensions.k8s.io/v1
14621462
kind: CustomResourceDefinition
@@ -1929,7 +1929,7 @@ spec:
19291929
storage: true
19301930
subresources:
19311931
status: {}
1932-
- name: podIdentityAssociationCRD
1932+
- id: podIdentityAssociationCRD
19331933
template:
19341934
apiVersion: apiextensions.k8s.io/v1
19351935
kind: CustomResourceDefinition

0 commit comments

Comments
 (0)