Skip to content

Commit ffbfd40

Browse files
mdboothmdbooth
committed
OpenStackClusterSpec: Network->pointer
1 parent 75079c7 commit ffbfd40

File tree

11 files changed

+52
-30
lines changed

11 files changed

+52
-30
lines changed

‎api/v1alpha5/conversion_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestConvertFrom(t *testing.T) {
4040
want ctrlconversion.Convertible
4141
}{
4242
{
43-
name: "conversion must have conversion-data annotation",
43+
name: "cluster conversion must have conversion-data annotation",
4444
spoke: &OpenStackCluster{},
4545
hub: &infrav1.OpenStackCluster{
4646
Spec: infrav1.OpenStackClusterSpec{},
@@ -51,13 +51,13 @@ func TestConvertFrom(t *testing.T) {
5151
},
5252
ObjectMeta: metav1.ObjectMeta{
5353
Annotations: map[string]string{
54-
"cluster.x-k8s.io/conversion-data": "{\"spec\":{\"apiServerLoadBalancer\":{},\"controlPlaneEndpoint\":{\"host\":\"\",\"port\":0},\"disableAPIServerFloatingIP\":false,\"disableExternalNetwork\":false,\"externalNetwork\":{},\"identityRef\":{\"cloudName\":\"\",\"name\":\"\"},\"network\":{}},\"status\":{\"ready\":false}}",
54+
"cluster.x-k8s.io/conversion-data": "{\"spec\":{\"apiServerLoadBalancer\":{},\"controlPlaneEndpoint\":{\"host\":\"\",\"port\":0},\"disableAPIServerFloatingIP\":false,\"disableExternalNetwork\":false,\"externalNetwork\":{},\"identityRef\":{\"cloudName\":\"\",\"name\":\"\"}},\"status\":{\"ready\":false}}",
5555
},
5656
},
5757
},
5858
},
5959
{
60-
name: "conversion must have conversion-data annotation",
60+
name: "cluster template conversion must have conversion-data annotation",
6161
spoke: &OpenStackClusterTemplate{},
6262
hub: &infrav1.OpenStackClusterTemplate{
6363
Spec: infrav1.OpenStackClusterTemplateSpec{},
@@ -72,13 +72,13 @@ func TestConvertFrom(t *testing.T) {
7272
},
7373
ObjectMeta: metav1.ObjectMeta{
7474
Annotations: map[string]string{
75-
"cluster.x-k8s.io/conversion-data": "{\"spec\":{\"template\":{\"spec\":{\"apiServerLoadBalancer\":{},\"controlPlaneEndpoint\":{\"host\":\"\",\"port\":0},\"disableAPIServerFloatingIP\":false,\"disableExternalNetwork\":false,\"externalNetwork\":{},\"identityRef\":{\"cloudName\":\"\",\"name\":\"\"},\"network\":{}}}}}",
75+
"cluster.x-k8s.io/conversion-data": "{\"spec\":{\"template\":{\"spec\":{\"apiServerLoadBalancer\":{},\"controlPlaneEndpoint\":{\"host\":\"\",\"port\":0},\"disableAPIServerFloatingIP\":false,\"disableExternalNetwork\":false,\"externalNetwork\":{},\"identityRef\":{\"cloudName\":\"\",\"name\":\"\"}}}}}",
7676
},
7777
},
7878
},
7979
},
8080
{
81-
name: "conversion must have conversion-data annotation",
81+
name: "machine conversion must have conversion-data annotation",
8282
spoke: &OpenStackMachine{},
8383
hub: &infrav1.OpenStackMachine{
8484
Spec: infrav1.OpenStackMachineSpec{},
@@ -93,7 +93,7 @@ func TestConvertFrom(t *testing.T) {
9393
},
9494
},
9595
{
96-
name: "conversion must have conversion-data annotation",
96+
name: "machine template conversion must have conversion-data annotation",
9797
spoke: &OpenStackMachineTemplate{},
9898
hub: &infrav1.OpenStackMachineTemplate{
9999
Spec: infrav1.OpenStackMachineTemplateSpec{},

‎api/v1alpha5/zz_generated.conversion.go‎

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

‎api/v1alpha6/openstackcluster_conversion.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,13 @@ func Convert_v1alpha6_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *O
197197
return err
198198
}
199199

200+
if in.Network != (NetworkFilter{}) {
201+
out.Network = &infrav1.NetworkFilter{}
202+
if err := Convert_v1alpha6_NetworkFilter_To_v1beta1_NetworkFilter(&in.Network, out.Network, s); err != nil {
203+
return err
204+
}
205+
}
206+
200207
if in.ExternalNetworkID != "" {
201208
out.ExternalNetwork = infrav1.NetworkFilter{
202209
ID: in.ExternalNetworkID,
@@ -245,6 +252,12 @@ func Convert_v1beta1_OpenStackClusterSpec_To_v1alpha6_OpenStackClusterSpec(in *i
245252
return err
246253
}
247254

255+
if in.Network != nil {
256+
if err := Convert_v1beta1_NetworkFilter_To_v1alpha6_NetworkFilter(in.Network, &out.Network, s); err != nil {
257+
return err
258+
}
259+
}
260+
248261
if in.ExternalNetwork.ID != "" {
249262
out.ExternalNetworkID = in.ExternalNetwork.ID
250263
}

‎api/v1alpha6/zz_generated.conversion.go‎

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

‎api/v1alpha7/openstackcluster_conversion.go‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,13 @@ func Convert_v1alpha7_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *O
199199
return err
200200
}
201201

202+
if in.Network != (NetworkFilter{}) {
203+
out.Network = &infrav1.NetworkFilter{}
204+
if err := Convert_v1alpha7_NetworkFilter_To_v1beta1_NetworkFilter(&in.Network, out.Network, s); err != nil {
205+
return err
206+
}
207+
}
208+
202209
if in.ExternalNetworkID != "" {
203210
out.ExternalNetwork = infrav1.NetworkFilter{
204211
ID: in.ExternalNetworkID,
@@ -247,6 +254,12 @@ func Convert_v1beta1_OpenStackClusterSpec_To_v1alpha7_OpenStackClusterSpec(in *i
247254
return err
248255
}
249256

257+
if in.Network != nil {
258+
if err := Convert_v1beta1_NetworkFilter_To_v1alpha7_NetworkFilter(in.Network, &out.Network, s); err != nil {
259+
return err
260+
}
261+
}
262+
250263
if in.ExternalNetwork.ID != "" {
251264
out.ExternalNetworkID = in.ExternalNetwork.ID
252265
}

‎api/v1alpha7/zz_generated.conversion.go‎

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

‎api/v1beta1/openstackcluster_types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ type OpenStackClusterSpec struct {
4545

4646
// Network specifies an existing network to use if no ManagedSubnets
4747
// are specified.
48-
Network NetworkFilter `json:"network,omitempty"`
48+
// +optional
49+
Network *NetworkFilter `json:"network,omitempty"`
4950

5051
// Subnets specifies existing subnets to use if not ManagedSubnets are
5152
// specified. All subnets must be in the network specified by Network.

‎api/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎controllers/openstackcluster_controller_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ var _ = Describe("OpenStackCluster controller", func() {
524524
ExternalNetwork: infrav1.NetworkFilter{
525525
ID: externalNetworkID,
526526
},
527-
Network: infrav1.NetworkFilter{
527+
Network: &infrav1.NetworkFilter{
528528
ID: clusterNetworkID,
529529
},
530530
}
@@ -603,7 +603,7 @@ var _ = Describe("OpenStackCluster controller", func() {
603603
ExternalNetwork: infrav1.NetworkFilter{
604604
ID: externalNetworkID,
605605
},
606-
Network: infrav1.NetworkFilter{
606+
Network: &infrav1.NetworkFilter{
607607
ID: clusterNetworkID,
608608
},
609609
Subnets: []infrav1.SubnetFilter{

‎docs/book/src/api/v1beta1/api.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ NetworkFilter
108108
</em>
109109
</td>
110110
<td>
111+
<em>(Optional)</em>
111112
<p>Network specifies an existing network to use if no ManagedSubnets
112113
are specified.</p>
113114
</td>
@@ -1986,6 +1987,7 @@ NetworkFilter
19861987
</em>
19871988
</td>
19881989
<td>
1990+
<em>(Optional)</em>
19891991
<p>Network specifies an existing network to use if no ManagedSubnets
19901992
are specified.</p>
19911993
</td>
@@ -2543,6 +2545,7 @@ NetworkFilter
25432545
</em>
25442546
</td>
25452547
<td>
2548+
<em>(Optional)</em>
25462549
<p>Network specifies an existing network to use if no ManagedSubnets
25472550
are specified.</p>
25482551
</td>

0 commit comments

Comments
 (0)