Skip to content

Commit

Permalink
⚠ Remove PortOpts.SecurityGroupFilters
Browse files Browse the repository at this point in the history
This turns PortOpts.SecurityGroups in v1alpha6 into
*[]SecurityGroupParam instead of *[]string and removes the
SecurityGroupFilters field which would contain the same information
otherwise.

Co-authored-by: Anwar Hassen <anwar.hassen@est.tech>
  • Loading branch information
lentzi90 and Anwar Hassen committed Sep 21, 2022
1 parent acab3dc commit 8934598
Show file tree
Hide file tree
Showing 16 changed files with 354 additions and 177 deletions.
2 changes: 1 addition & 1 deletion api/v1alpha4/conversion_test.go
Expand Up @@ -307,7 +307,7 @@ func TestFuzzyConversion(t *testing.T) {
v1alpha6PortOpts.Network = nil
}
}
v1alpha6PortOpts.SecurityGroupFilters = nil
v1alpha6PortOpts.SecurityGroups = nil
},
func(v1alpha6FixedIP *infrav1.FixedIP, c fuzz.Continue) {
c.FuzzNoCustom(v1alpha6FixedIP)
Expand Down
21 changes: 18 additions & 3 deletions api/v1alpha4/zz_generated.conversion.go

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

35 changes: 35 additions & 0 deletions api/v1alpha5/conversion.go
Expand Up @@ -202,3 +202,38 @@ func Convert_v1alpha6_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(in *
// Our new flag has no equivalent in v1alpha5
return autoConvert_v1alpha6_OpenStackClusterSpec_To_v1alpha5_OpenStackClusterSpec(in, out, s)
}

func Convert_v1alpha5_PortOpts_To_v1alpha6_PortOpts(in *PortOpts, out *infrav1.PortOpts, s conversion.Scope) error {
err := autoConvert_v1alpha5_PortOpts_To_v1alpha6_PortOpts(in, out, s)
if err != nil {
return err
}
// SecurityGroupFilters were removed in v1alpha6. It is included in the SecurityGroups field in v1alpha6.
if in.SecurityGroupFilters != nil {
for _, v1alpha5SecurityGroupParam := range in.SecurityGroupFilters {
*out.SecurityGroups = append(*out.SecurityGroups, infrav1.SecurityGroupParam{UUID: v1alpha5SecurityGroupParam.UUID})
}
}
return nil
}

func Convert_Slice_v1alpha5_Network_To_Slice_v1alpha6_Network(in *[]Network, out *[]infrav1.Network, s conversion.Scope) error {
*out = make([]infrav1.Network, len(*in))
for i := range *in {
if err := Convert_v1alpha5_Network_To_v1alpha6_Network(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}

return nil
}

func Convert_Slice_v1alpha6_Network_To_Slice_v1alpha5_Network(in *[]infrav1.Network, out *[]Network, s conversion.Scope) error {
*out = make([]Network, len(*in))
for i := range *in {
if err := Convert_v1alpha6_Network_To_v1alpha5_Network(&(*in)[i], &(*out)[i], s); err != nil {
return err
}
}
return nil
}

0 comments on commit 8934598

Please sign in to comment.