Skip to content

Commit 89b6ead

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #1563 from shiftstack/filters
⚠️Remove last uses of TenantID and pagination filters
2 parents 904381c + 2d5c71d commit 89b6ead

14 files changed

+109
-159
lines changed

‎api/v1alpha5/conversion.go‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -273,9 +273,27 @@ func Convert_v1alpha7_NetworkStatus_To_v1alpha5_Network(in *infrav1.NetworkStatu
273273
return nil
274274
}
275275

276-
func Convert_v1alpha5_SecurityGroupParam_To_v1alpha7_SecurityGroupFilter(in *SecurityGroupParam, out *infrav1.SecurityGroupFilter, _ conversion.Scope) error {
276+
func Convert_v1alpha5_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(in *SecurityGroupFilter, out *infrav1.SecurityGroupFilter, s conversion.Scope) error {
277+
err := autoConvert_v1alpha5_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(in, out, s)
278+
if err != nil {
279+
return err
280+
}
281+
282+
// TenantID has been removed in v1alpha7. Write it to ProjectID if ProjectID is not already set.
283+
if out.ProjectID == "" {
284+
out.ProjectID = in.TenantID
285+
}
286+
287+
return nil
288+
}
289+
290+
func Convert_v1alpha5_SecurityGroupParam_To_v1alpha7_SecurityGroupFilter(in *SecurityGroupParam, out *infrav1.SecurityGroupFilter, s conversion.Scope) error {
277291
// SecurityGroupParam is replaced by its contained SecurityGroupFilter in v1alpha7
278-
*out = infrav1.SecurityGroupFilter(in.Filter)
292+
err := Convert_v1alpha5_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(&in.Filter, out, s)
293+
if err != nil {
294+
return err
295+
}
296+
279297
if in.UUID != "" {
280298
out.ID = in.UUID
281299
}
@@ -285,9 +303,13 @@ func Convert_v1alpha5_SecurityGroupParam_To_v1alpha7_SecurityGroupFilter(in *Sec
285303
return nil
286304
}
287305

288-
func Convert_v1alpha7_SecurityGroupFilter_To_v1alpha5_SecurityGroupParam(in *infrav1.SecurityGroupFilter, out *SecurityGroupParam, _ conversion.Scope) error {
306+
func Convert_v1alpha7_SecurityGroupFilter_To_v1alpha5_SecurityGroupParam(in *infrav1.SecurityGroupFilter, out *SecurityGroupParam, s conversion.Scope) error {
289307
// SecurityGroupParam is replaced by its contained SecurityGroupFilter in v1alpha7
290-
out.Filter = SecurityGroupFilter(*in)
308+
err := Convert_v1alpha7_SecurityGroupFilter_To_v1alpha5_SecurityGroupFilter(in, &out.Filter, s)
309+
if err != nil {
310+
return err
311+
}
312+
291313
if in.ID != "" {
292314
out.UUID = in.ID
293315
}

‎api/v1alpha5/zz_generated.conversion.go‎

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

‎api/v1alpha6/conversion.go‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -472,9 +472,27 @@ func Convert_v1alpha7_NetworkStatus_To_v1alpha6_Network(in *infrav1.NetworkStatu
472472
return nil
473473
}
474474

475-
func Convert_v1alpha6_SecurityGroupParam_To_v1alpha7_SecurityGroupFilter(in *SecurityGroupParam, out *infrav1.SecurityGroupFilter, _ conversion.Scope) error {
475+
func Convert_v1alpha6_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(in *SecurityGroupFilter, out *infrav1.SecurityGroupFilter, s conversion.Scope) error {
476+
err := autoConvert_v1alpha6_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(in, out, s)
477+
if err != nil {
478+
return err
479+
}
480+
481+
// TenantID has been removed in v1alpha7. Write it to ProjectID if ProjectID is not already set.
482+
if out.ProjectID == "" {
483+
out.ProjectID = in.TenantID
484+
}
485+
486+
return nil
487+
}
488+
489+
func Convert_v1alpha6_SecurityGroupParam_To_v1alpha7_SecurityGroupFilter(in *SecurityGroupParam, out *infrav1.SecurityGroupFilter, s conversion.Scope) error {
476490
// SecurityGroupParam is replaced by its contained SecurityGroupFilter in v1alpha7
477-
*out = infrav1.SecurityGroupFilter(in.Filter)
491+
err := Convert_v1alpha6_SecurityGroupFilter_To_v1alpha7_SecurityGroupFilter(&in.Filter, out, s)
492+
if err != nil {
493+
return err
494+
}
495+
478496
if in.UUID != "" {
479497
out.ID = in.UUID
480498
}
@@ -484,9 +502,13 @@ func Convert_v1alpha6_SecurityGroupParam_To_v1alpha7_SecurityGroupFilter(in *Sec
484502
return nil
485503
}
486504

487-
func Convert_v1alpha7_SecurityGroupFilter_To_v1alpha6_SecurityGroupParam(in *infrav1.SecurityGroupFilter, out *SecurityGroupParam, _ conversion.Scope) error {
505+
func Convert_v1alpha7_SecurityGroupFilter_To_v1alpha6_SecurityGroupParam(in *infrav1.SecurityGroupFilter, out *SecurityGroupParam, s conversion.Scope) error {
488506
// SecurityGroupParam is replaced by its contained SecurityGroupFilter in v1alpha7
489-
out.Filter = SecurityGroupFilter(*in)
507+
err := Convert_v1alpha7_SecurityGroupFilter_To_v1alpha6_SecurityGroupFilter(in, &out.Filter, s)
508+
if err != nil {
509+
return err
510+
}
511+
490512
if in.ID != "" {
491513
out.UUID = in.ID
492514
}

‎api/v1alpha6/zz_generated.conversion.go‎

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

‎api/v1alpha7/filter_convert.go‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,24 @@ package v1alpha7
1818

1919
import (
2020
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/routers"
21+
securitygroups "github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups"
2122
"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
2223
"github.com/gophercloud/gophercloud/openstack/networking/v2/subnets"
2324
)
2425

26+
func (securityGroupFilter SecurityGroupFilter) ToListOpt() securitygroups.ListOpts {
27+
return securitygroups.ListOpts{
28+
ID: securityGroupFilter.ID,
29+
Name: securityGroupFilter.Name,
30+
Description: securityGroupFilter.Description,
31+
ProjectID: securityGroupFilter.ProjectID,
32+
Tags: securityGroupFilter.Tags,
33+
TagsAny: securityGroupFilter.TagsAny,
34+
NotTags: securityGroupFilter.NotTags,
35+
NotTagsAny: securityGroupFilter.NotTagsAny,
36+
}
37+
}
38+
2539
func (subnetFilter SubnetFilter) ToListOpt() subnets.ListOpts {
2640
return subnets.ListOpts{
2741
Name: subnetFilter.Name,

‎api/v1alpha7/types.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,7 @@ type SecurityGroupFilter struct {
3333
ID string `json:"id,omitempty"`
3434
Name string `json:"name,omitempty"`
3535
Description string `json:"description,omitempty"`
36-
TenantID string `json:"tenantId,omitempty"`
3736
ProjectID string `json:"projectId,omitempty"`
38-
Limit int `json:"limit,omitempty"`
39-
Marker string `json:"marker,omitempty"`
40-
SortKey string `json:"sortKey,omitempty"`
41-
SortDir string `json:"sortDir,omitempty"`
4237
Tags string `json:"tags,omitempty"`
4338
TagsAny string `json:"tagsAny,omitempty"`
4439
NotTags string `json:"notTags,omitempty"`
@@ -94,7 +89,6 @@ type PortOpts struct {
9489
MACAddress string `json:"macAddress,omitempty"`
9590
// Specify pairs of subnet and/or IP address. These should be subnets of the network with the given NetworkID.
9691
FixedIPs []FixedIP `json:"fixedIPs,omitempty"`
97-
TenantID string `json:"tenantId,omitempty"`
9892
ProjectID string `json:"projectId,omitempty"`
9993
// The names, uuids, filters or any combination these of the security groups to assign to the instance
10094
SecurityGroupFilters []SecurityGroupFilter `json:"securityGroupFilters,omitempty"`

‎config/crd/bases/infrastructure.cluster.x-k8s.io_openstackclusters.yaml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3950,10 +3950,6 @@ spec:
39503950
type: string
39513951
id:
39523952
type: string
3953-
limit:
3954-
type: integer
3955-
marker:
3956-
type: string
39573953
name:
39583954
type: string
39593955
notTags:
@@ -3962,16 +3958,10 @@ spec:
39623958
type: string
39633959
projectId:
39643960
type: string
3965-
sortDir:
3966-
type: string
3967-
sortKey:
3968-
type: string
39693961
tags:
39703962
type: string
39713963
tagsAny:
39723964
type: string
3973-
tenantId:
3974-
type: string
39753965
type: object
39763966
type: array
39773967
tags:
@@ -3983,8 +3973,6 @@ spec:
39833973
type: string
39843974
type: array
39853975
x-kubernetes-list-type: set
3986-
tenantId:
3987-
type: string
39883976
trunk:
39893977
description: Enables and disables trunk at port level.
39903978
If not provided, openStackMachine.Spec.Trunk is inherited.
@@ -4048,10 +4036,6 @@ spec:
40484036
type: string
40494037
id:
40504038
type: string
4051-
limit:
4052-
type: integer
4053-
marker:
4054-
type: string
40554039
name:
40564040
type: string
40574041
notTags:
@@ -4060,16 +4044,10 @@ spec:
40604044
type: string
40614045
projectId:
40624046
type: string
4063-
sortDir:
4064-
type: string
4065-
sortKey:
4066-
type: string
40674047
tags:
40684048
type: string
40694049
tagsAny:
40704050
type: string
4071-
tenantId:
4072-
type: string
40734051
type: object
40744052
type: array
40754053
serverGroupID:

0 commit comments

Comments
 (0)