Skip to content

Commit

Permalink
Passing security groups by filter instead of ID on ports
Browse files Browse the repository at this point in the history
  • Loading branch information
Anwar Hassen committed May 23, 2022
1 parent 85acc2a commit 61f52c6
Show file tree
Hide file tree
Showing 12 changed files with 399 additions and 7 deletions.
1 change: 1 addition & 0 deletions api/v1alpha4/conversion_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ func TestFuzzyConversion(t *testing.T) {
v1alpha5PortOpts.Network = nil
}
}
v1alpha5PortOpts.SecurityGroupFilters = nil
},
func(v1alpha5FixedIP *infrav1.FixedIP, c fuzz.Continue) {
c.FuzzNoCustom(v1alpha5FixedIP)
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha4/zz_generated.conversion.go
View file

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

13 changes: 8 additions & 5 deletions api/v1alpha5/types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,14 @@ type PortOpts struct {
AdminStateUp *bool `json:"adminStateUp,omitempty"`
MACAddress string `json:"macAddress,omitempty"`
// Specify pairs of subnet and/or IP address. These should be subnets of the network with the given NetworkID.
FixedIPs []FixedIP `json:"fixedIPs,omitempty"`
TenantID string `json:"tenantId,omitempty"`
ProjectID string `json:"projectId,omitempty"`
SecurityGroups *[]string `json:"securityGroups,omitempty"`
AllowedAddressPairs []AddressPair `json:"allowedAddressPairs,omitempty"`
FixedIPs []FixedIP `json:"fixedIPs,omitempty"`
TenantID string `json:"tenantId,omitempty"`
ProjectID string `json:"projectId,omitempty"`
// The uuids of the security groups to assign to the instance
SecurityGroups *[]string `json:"securityGroups,omitempty"`
// The names, uuids, filters or any combination these of the security groups to assign to the instance
SecurityGroupFilters []SecurityGroupParam `json:"securityGroupFilters,omitempty"`
AllowedAddressPairs []AddressPair `json:"allowedAddressPairs,omitempty"`
// Enables and disables trunk at port level. If not provided, openStackMachine.Spec.Trunk is inherited.
Trunk *bool `json:"trunk,omitempty"`

Expand Down
5 changes: 5 additions & 0 deletions api/v1alpha5/zz_generated.deepcopy.go
View file

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

184 changes: 184 additions & 0 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2779,7 +2779,53 @@ spec:
type: object
projectId:
type: string
securityGroupFilters:
description: The names, uuids, filters or any combination
these of the security groups to assign to the instance
items:
properties:
filter:
description: Filters used to query security groups
in openstack
properties:
description:
type: string
id:
type: string
limit:
type: integer
marker:
type: string
name:
type: string
notTags:
type: string
notTagsAny:
type: string
projectId:
type: string
sortDir:
type: string
sortKey:
type: string
tags:
type: string
tagsAny:
type: string
tenantId:
type: string
type: object
name:
description: Security Group name
type: string
uuid:
description: Security Group UID
type: string
type: object
type: array
securityGroups:
description: The uuids of the security groups to assign
to the instance
items:
type: string
type: array
Expand Down Expand Up @@ -3252,7 +3298,53 @@ spec:
type: object
projectId:
type: string
securityGroupFilters:
description: The names, uuids, filters or any combination
these of the security groups to assign to the instance
items:
properties:
filter:
description: Filters used to query security groups
in openstack
properties:
description:
type: string
id:
type: string
limit:
type: integer
marker:
type: string
name:
type: string
notTags:
type: string
notTagsAny:
type: string
projectId:
type: string
sortDir:
type: string
sortKey:
type: string
tags:
type: string
tagsAny:
type: string
tenantId:
type: string
type: object
name:
description: Security Group name
type: string
uuid:
description: Security Group UID
type: string
type: object
type: array
securityGroups:
description: The uuids of the security groups to assign
to the instance
items:
type: string
type: array
Expand Down Expand Up @@ -3586,7 +3678,53 @@ spec:
type: object
projectId:
type: string
securityGroupFilters:
description: The names, uuids, filters or any combination
these of the security groups to assign to the instance
items:
properties:
filter:
description: Filters used to query security groups in
openstack
properties:
description:
type: string
id:
type: string
limit:
type: integer
marker:
type: string
name:
type: string
notTags:
type: string
notTagsAny:
type: string
projectId:
type: string
sortDir:
type: string
sortKey:
type: string
tags:
type: string
tagsAny:
type: string
tenantId:
type: string
type: object
name:
description: Security Group name
type: string
uuid:
description: Security Group UID
type: string
type: object
type: array
securityGroups:
description: The uuids of the security groups to assign to
the instance
items:
type: string
type: array
Expand Down Expand Up @@ -3834,7 +3972,53 @@ spec:
type: object
projectId:
type: string
securityGroupFilters:
description: The names, uuids, filters or any combination
these of the security groups to assign to the instance
items:
properties:
filter:
description: Filters used to query security groups in
openstack
properties:
description:
type: string
id:
type: string
limit:
type: integer
marker:
type: string
name:
type: string
notTags:
type: string
notTagsAny:
type: string
projectId:
type: string
sortDir:
type: string
sortKey:
type: string
tags:
type: string
tagsAny:
type: string
tenantId:
type: string
type: object
name:
description: Security Group name
type: string
uuid:
description: Security Group UID
type: string
type: object
type: array
securityGroups:
description: The uuids of the security groups to assign to
the instance
items:
type: string
type: array
Expand Down
47 changes: 47 additions & 0 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclustertemplates.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,54 @@ spec:
type: object
projectId:
type: string
securityGroupFilters:
description: The names, uuids, filters or any
combination these of the security groups to
assign to the instance
items:
properties:
filter:
description: Filters used to query security
groups in openstack
properties:
description:
type: string
id:
type: string
limit:
type: integer
marker:
type: string
name:
type: string
notTags:
type: string
notTagsAny:
type: string
projectId:
type: string
sortDir:
type: string
sortKey:
type: string
tags:
type: string
tagsAny:
type: string
tenantId:
type: string
type: object
name:
description: Security Group name
type: string
uuid:
description: Security Group UID
type: string
type: object
type: array
securityGroups:
description: The uuids of the security groups
to assign to the instance
items:
type: string
type: array
Expand Down
46 changes: 46 additions & 0 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_openstackmachines.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1044,7 +1044,53 @@ spec:
type: object
projectId:
type: string
securityGroupFilters:
description: The names, uuids, filters or any combination these
of the security groups to assign to the instance
items:
properties:
filter:
description: Filters used to query security groups in
openstack
properties:
description:
type: string
id:
type: string
limit:
type: integer
marker:
type: string
name:
type: string
notTags:
type: string
notTagsAny:
type: string
projectId:
type: string
sortDir:
type: string
sortKey:
type: string
tags:
type: string
tagsAny:
type: string
tenantId:
type: string
type: object
name:
description: Security Group name
type: string
uuid:
description: Security Group UID
type: string
type: object
type: array
securityGroups:
description: The uuids of the security groups to assign to the
instance
items:
type: string
type: array
Expand Down
Loading

0 comments on commit 61f52c6

Please sign in to comment.