Skip to content

Commit cd75ad9

Browse files
a-hilalya-hilaly
authored
Add VPC and SecurityGroup references for UserIDGroupPair type (#187)
Addresses: aws-controllers-k8s/community#2059 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
1 parent 067f19a commit cd75ad9

File tree

8 files changed

+369
-25
lines changed

8 files changed

+369
-25
lines changed

‎apis/v1alpha1/ack-generate-metadata.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ack_generate_info:
2-
build_date: "2024-03-29T14:28:01Z"
3-
build_hash: e8df4d5a4b86dea0e227786c2c3d213e5aeda97a
4-
go_version: go1.22.0
5-
version: v0.33.0
6-
api_directory_checksum: 978f0d4c5a7a660b987ba1e5c2be3a62ab53554c
2+
build_date: "2024-04-22T12:02:00Z"
3+
build_hash: d660ee36fe947607ebea039acd47c35477b4a836
4+
go_version: go1.22.1
5+
version: v0.33.0-2-gd660ee3
6+
api_directory_checksum: bd9acc4aac1be7c405bd90c14e37da4e15ed82bc
77
api_version: v1alpha1
88
aws_sdk_go_version: v1.44.93
99
generator_config_info:
10-
file_checksum: 216d65c35dbc73d4eaaa52c2f5c84444abf4a960
10+
file_checksum: 21aa2c0035772a834102dcdac81a186fe148212c
1111
original_file_name: generator.yaml
1212
last_modification:
1313
reason: API generation

‎apis/v1alpha1/generator.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,18 @@ resources:
548548
references:
549549
resource: VPC
550550
path: Status.VPCID
551+
IngressRules.UserIDGroupPairs.VPCID:
552+
references:
553+
resource: VPC
554+
path: Status.VPCID
555+
IngressRules.UserIDGroupPairs.GroupID:
556+
references:
557+
resource: SecurityGroup
558+
path: Status.ID
559+
IngressRules.UserIDGroupPairs.GroupName:
560+
references:
561+
resource: SecurityGroup
562+
path: Spec.Name
551563
renames:
552564
operations:
553565
CreateSecurityGroup:

‎apis/v1alpha1/types.go‎

Lines changed: 11 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apis/v1alpha1/zz_generated.deepcopy.go‎

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎config/crd/bases/ec2.services.k8s.aws_securitygroups.yaml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,18 @@ spec:
120120
type: string
121121
groupName:
122122
type: string
123+
groupRef:
124+
description: Reference field for GroupName
125+
properties:
126+
from:
127+
description: |-
128+
AWSResourceReference provides all the values necessary to reference another
129+
k8s resource for finding the identifier(Id/ARN/Name)
130+
properties:
131+
name:
132+
type: string
133+
type: object
134+
type: object
123135
peeringStatus:
124136
type: string
125137
userID:
@@ -128,6 +140,18 @@ spec:
128140
type: string
129141
vpcPeeringConnectionID:
130142
type: string
143+
vpcRef:
144+
description: Reference field for VPCID
145+
properties:
146+
from:
147+
description: |-
148+
AWSResourceReference provides all the values necessary to reference another
149+
k8s resource for finding the identifier(Id/ARN/Name)
150+
properties:
151+
name:
152+
type: string
153+
type: object
154+
type: object
131155
type: object
132156
type: array
133157
type: object
@@ -192,6 +216,18 @@ spec:
192216
type: string
193217
groupName:
194218
type: string
219+
groupRef:
220+
description: Reference field for GroupName
221+
properties:
222+
from:
223+
description: |-
224+
AWSResourceReference provides all the values necessary to reference another
225+
k8s resource for finding the identifier(Id/ARN/Name)
226+
properties:
227+
name:
228+
type: string
229+
type: object
230+
type: object
195231
peeringStatus:
196232
type: string
197233
userID:
@@ -200,6 +236,18 @@ spec:
200236
type: string
201237
vpcPeeringConnectionID:
202238
type: string
239+
vpcRef:
240+
description: Reference field for VPCID
241+
properties:
242+
from:
243+
description: |-
244+
AWSResourceReference provides all the values necessary to reference another
245+
k8s resource for finding the identifier(Id/ARN/Name)
246+
properties:
247+
name:
248+
type: string
249+
type: object
250+
type: object
203251
type: object
204252
type: array
205253
type: object

‎generator.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,18 @@ resources:
548548
references:
549549
resource: VPC
550550
path: Status.VPCID
551+
IngressRules.UserIDGroupPairs.VPCID:
552+
references:
553+
resource: VPC
554+
path: Status.VPCID
555+
IngressRules.UserIDGroupPairs.GroupID:
556+
references:
557+
resource: SecurityGroup
558+
path: Status.ID
559+
IngressRules.UserIDGroupPairs.GroupName:
560+
references:
561+
resource: SecurityGroup
562+
path: Spec.Name
551563
renames:
552564
operations:
553565
CreateSecurityGroup:

‎helm/crds/ec2.services.k8s.aws_securitygroups.yaml‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,18 @@ spec:
120120
type: string
121121
groupName:
122122
type: string
123+
groupRef:
124+
description: Reference field for GroupName
125+
properties:
126+
from:
127+
description: |-
128+
AWSResourceReference provides all the values necessary to reference another
129+
k8s resource for finding the identifier(Id/ARN/Name)
130+
properties:
131+
name:
132+
type: string
133+
type: object
134+
type: object
123135
peeringStatus:
124136
type: string
125137
userID:
@@ -128,6 +140,18 @@ spec:
128140
type: string
129141
vpcPeeringConnectionID:
130142
type: string
143+
vpcRef:
144+
description: Reference field for VPCID
145+
properties:
146+
from:
147+
description: |-
148+
AWSResourceReference provides all the values necessary to reference another
149+
k8s resource for finding the identifier(Id/ARN/Name)
150+
properties:
151+
name:
152+
type: string
153+
type: object
154+
type: object
131155
type: object
132156
type: array
133157
type: object
@@ -192,6 +216,18 @@ spec:
192216
type: string
193217
groupName:
194218
type: string
219+
groupRef:
220+
description: Reference field for GroupName
221+
properties:
222+
from:
223+
description: |-
224+
AWSResourceReference provides all the values necessary to reference another
225+
k8s resource for finding the identifier(Id/ARN/Name)
226+
properties:
227+
name:
228+
type: string
229+
type: object
230+
type: object
195231
peeringStatus:
196232
type: string
197233
userID:
@@ -200,6 +236,18 @@ spec:
200236
type: string
201237
vpcPeeringConnectionID:
202238
type: string
239+
vpcRef:
240+
description: Reference field for VPCID
241+
properties:
242+
from:
243+
description: |-
244+
AWSResourceReference provides all the values necessary to reference another
245+
k8s resource for finding the identifier(Id/ARN/Name)
246+
properties:
247+
name:
248+
type: string
249+
type: object
250+
type: object
203251
type: object
204252
type: array
205253
type: object

0 commit comments

Comments
 (0)