Skip to content

Commit ecc3c0a

Browse files
Add cross-api resource references to all resources (#42)
Description of changes: Adds IAM, KMS and EC2 resource references to all applicable fields By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 2011f4c commit ecc3c0a

32 files changed

+1283
-40
lines changed
+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2022-05-05T22:12:37Z"
3-
build_hash: 52584bbac484b4746c5c93dbad9d0cd90fd9d700
4-
go_version: go1.17.5
5-
version: v0.18.4-9-g52584bb
6-
api_directory_checksum: 5fc33b04db77ac596030ce3a031a0310da0b923f
2+
build_date: "2022-05-09T19:51:01Z"
3+
build_hash: c6efa6ac643edb21219e0763541b2558718b5fe6
4+
go_version: go1.18.1
5+
version: v0.18.4-10-gc6efa6a
6+
api_directory_checksum: 7b070fe012124ee552759771abc96d313cd2be43
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.42.28
99
generator_config_info:
10-
file_checksum: 56a08a2624b3ec00e907af51f8d77f3d80337eee
10+
file_checksum: 02b182d2c811668071f55eb04eb115dd3c4ecc91
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

apis/v1alpha1/addon.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/cluster.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/fargate_profile.go

+4-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/generator.yaml

+51
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ resources:
55
references:
66
resource: Cluster
77
path: Spec.Name
8+
ServiceAccountRoleArn:
9+
references:
10+
service_name: iam
11+
resource: Role
12+
path: Status.ACKResourceMetadata.ARN
813
renames:
914
operations:
1015
CreateAddon:
@@ -34,6 +39,27 @@ resources:
3439
- MissingParameter
3540
- ValidationError
3641
Cluster:
42+
fields:
43+
EncryptionProvider.Provider.KeyArn:
44+
references:
45+
service_name: kms
46+
resources: Key
47+
path: Status.ACKResourceMetadata.ARN
48+
RoleArn:
49+
references:
50+
service_name: iam
51+
resource: Role
52+
path: Status.ACKResourceMetadata.ARN
53+
ResourcesVpcConfig.SecurityGroupIds:
54+
references:
55+
service_name: ec2
56+
resource: SecurityGroup
57+
path: Status.ID
58+
ResourcesVpcConfig.SubnetIds:
59+
references:
60+
service_name: ec2
61+
resource: Subnet
62+
path: Status.SubnetID
3763
exceptions:
3864
errors:
3965
404:
@@ -68,6 +94,16 @@ resources:
6894
references:
6995
resource: Cluster
7096
path: Spec.Name
97+
PodExecutionRoleArn:
98+
references:
99+
service_name: iam
100+
resource: Role
101+
path: Status.ACKResourceMetadata.ARN
102+
Subnets:
103+
references:
104+
service_name: ec2
105+
resource: Subnet
106+
path: Status.SubnetID
71107
renames:
72108
operations:
73109
CreateFargateProfile:
@@ -114,6 +150,21 @@ resources:
114150
references:
115151
resource: Cluster
116152
path: Spec.Name
153+
NodeRole:
154+
references:
155+
service_name: iam
156+
resource: Role
157+
path: Status.ACKResourceMetadata.ARN
158+
RemoteAccess.SourceSecurityGroups:
159+
references:
160+
service_name: ec2
161+
resource: SecurityGroup
162+
path: Status.ID
163+
Subnets:
164+
references:
165+
service_name: ec2
166+
resource: Subnet
167+
path: Status.SubnetID
117168
renames:
118169
operations:
119170
CreateNodegroup:

apis/v1alpha1/nodegroup.go

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/types.go

+9-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apis/v1alpha1/zz_generated.deepcopy.go

+75
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/controller/main.go

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/eks.services.k8s.aws_addons.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,20 @@ spec:
8484
accounts on your cluster (https://docs.aws.amazon.com/eks/latest/userguide/enable-iam-roles-for-service-accounts.html)
8585
in the Amazon EKS User Guide."
8686
type: string
87+
serviceAccountRoleRef:
88+
description: 'AWSResourceReferenceWrapper provides a wrapper around
89+
*AWSResourceReference type to provide more user friendly syntax
90+
for references using ''from'' field Ex: APIIDRef: from: name:
91+
my-api'
92+
properties:
93+
from:
94+
description: AWSResourceReference provides all the values necessary
95+
to reference another k8s resource for finding the identifier(Id/ARN/Name)
96+
properties:
97+
name:
98+
type: string
99+
type: object
100+
type: object
87101
tags:
88102
additionalProperties:
89103
type: string

0 commit comments

Comments
 (0)