Skip to content

Commit

Permalink
Add VPC and SecurityGroup references for UserIDGroupPair type (#…
Browse files Browse the repository at this point in the history 
…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.
  • Loading branch information
@a-hilaly
a-hilaly committed Apr 22, 2024
1 parent 067f19a commit cd75ad9
Show file tree
Hide file tree
Showing 8 changed files with 369 additions and 25 deletions.
12 changes: 6 additions & 6 deletions apis/v1alpha1/ack-generate-metadata.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ack_generate_info:
build_date: "2024-03-29T14:28:01Z"
build_hash: e8df4d5a4b86dea0e227786c2c3d213e5aeda97a
go_version: go1.22.0
version: v0.33.0
api_directory_checksum: 978f0d4c5a7a660b987ba1e5c2be3a62ab53554c
build_date: "2024-04-22T12:02:00Z"
build_hash: d660ee36fe947607ebea039acd47c35477b4a836
go_version: go1.22.1
version: v0.33.0-2-gd660ee3
api_directory_checksum: bd9acc4aac1be7c405bd90c14e37da4e15ed82bc
api_version: v1alpha1
aws_sdk_go_version: v1.44.93
generator_config_info:
file_checksum: 216d65c35dbc73d4eaaa52c2f5c84444abf4a960
file_checksum: 21aa2c0035772a834102dcdac81a186fe148212c
original_file_name: generator.yaml
last_modification:
reason: API generation
12 changes: 12 additions & 0 deletions apis/v1alpha1/generator.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,18 @@ resources:
references:
resource: VPC
path: Status.VPCID
IngressRules.UserIDGroupPairs.VPCID:
references:
resource: VPC
path: Status.VPCID
IngressRules.UserIDGroupPairs.GroupID:
references:
resource: SecurityGroup
path: Status.ID
IngressRules.UserIDGroupPairs.GroupName:
references:
resource: SecurityGroup
path: Spec.Name
renames:
operations:
CreateSecurityGroup:
Expand Down
18 changes: 11 additions & 7 deletions apis/v1alpha1/types.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions apis/v1alpha1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 48 additions & 0 deletions config/crd/bases/ec2.services.k8s.aws_securitygroups.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,18 @@ spec:
type: string
groupName:
type: string
groupRef:
description: Reference field for GroupName
properties:
from:
description: |-
AWSResourceReference provides all the values necessary to reference another
k8s resource for finding the identifier(Id/ARN/Name)
properties:
name:
type: string
type: object
type: object
peeringStatus:
type: string
userID:
Expand All @@ -128,6 +140,18 @@ spec:
type: string
vpcPeeringConnectionID:
type: string
vpcRef:
description: Reference field for VPCID
properties:
from:
description: |-
AWSResourceReference provides all the values necessary to reference another
k8s resource for finding the identifier(Id/ARN/Name)
properties:
name:
type: string
type: object
type: object
type: object
type: array
type: object
Expand Down Expand Up @@ -192,6 +216,18 @@ spec:
type: string
groupName:
type: string
groupRef:
description: Reference field for GroupName
properties:
from:
description: |-
AWSResourceReference provides all the values necessary to reference another
k8s resource for finding the identifier(Id/ARN/Name)
properties:
name:
type: string
type: object
type: object
peeringStatus:
type: string
userID:
Expand All @@ -200,6 +236,18 @@ spec:
type: string
vpcPeeringConnectionID:
type: string
vpcRef:
description: Reference field for VPCID
properties:
from:
description: |-
AWSResourceReference provides all the values necessary to reference another
k8s resource for finding the identifier(Id/ARN/Name)
properties:
name:
type: string
type: object
type: object
type: object
type: array
type: object
Expand Down
12 changes: 12 additions & 0 deletions generator.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -548,6 +548,18 @@ resources:
references:
resource: VPC
path: Status.VPCID
IngressRules.UserIDGroupPairs.VPCID:
references:
resource: VPC
path: Status.VPCID
IngressRules.UserIDGroupPairs.GroupID:
references:
resource: SecurityGroup
path: Status.ID
IngressRules.UserIDGroupPairs.GroupName:
references:
resource: SecurityGroup
path: Spec.Name
renames:
operations:
CreateSecurityGroup:
Expand Down
48 changes: 48 additions & 0 deletions helm/crds/ec2.services.k8s.aws_securitygroups.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,18 @@ spec:
type: string
groupName:
type: string
groupRef:
description: Reference field for GroupName
properties:
from:
description: |-
AWSResourceReference provides all the values necessary to reference another
k8s resource for finding the identifier(Id/ARN/Name)
properties:
name:
type: string
type: object
type: object
peeringStatus:
type: string
userID:
Expand All @@ -128,6 +140,18 @@ spec:
type: string
vpcPeeringConnectionID:
type: string
vpcRef:
description: Reference field for VPCID
properties:
from:
description: |-
AWSResourceReference provides all the values necessary to reference another
k8s resource for finding the identifier(Id/ARN/Name)
properties:
name:
type: string
type: object
type: object
type: object
type: array
type: object
Expand Down Expand Up @@ -192,6 +216,18 @@ spec:
type: string
groupName:
type: string
groupRef:
description: Reference field for GroupName
properties:
from:
description: |-
AWSResourceReference provides all the values necessary to reference another
k8s resource for finding the identifier(Id/ARN/Name)
properties:
name:
type: string
type: object
type: object
peeringStatus:
type: string
userID:
Expand All @@ -200,6 +236,18 @@ spec:
type: string
vpcPeeringConnectionID:
type: string
vpcRef:
description: Reference field for VPCID
properties:
from:
description: |-
AWSResourceReference provides all the values necessary to reference another
k8s resource for finding the identifier(Id/ARN/Name)
properties:
name:
type: string
type: object
type: object
type: object
type: array
type: object
Expand Down
Loading

0 comments on commit cd75ad9

Please sign in to comment.