Skip to content

Commit a88f062

Browse files
sivcharisivchari
committed
add manually conversion
Signed-off-by: sivchari <[email protected]>
1 parent c0a68d5 commit a88f062

File tree

3 files changed

+121
-16
lines changed

3 files changed

+121
-16
lines changed

‎test/infrastructure/docker/api/v1alpha3/conversion.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ func (src *DockerCluster) ConvertTo(dstRaw conversion.Hub) error {
5858
}
5959

6060
dst.Status.Conditions = restored.Status.Conditions
61+
dst.Status.Initialization = restored.Status.Initialization
6162

6263
return nil
6364
}
@@ -95,6 +96,7 @@ func (src *DockerMachine) ConvertTo(dstRaw conversion.Hub) error {
9596
}
9697

9798
dst.Status.Conditions = restored.Status.Conditions
99+
dst.Status.Initialization = restored.Status.Initialization
98100

99101
return nil
100102
}
@@ -256,7 +258,10 @@ func Convert_v1alpha3_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *Doc
256258
if out.Initialization == nil {
257259
out.Initialization = &infrav1.DockerMachineInitializationStatus{}
258260
}
259-
out.Initialization.Provisioned = ptr.To(in.Ready)
261+
262+
if in.Ready {
263+
out.Initialization.Provisioned = ptr.To(in.Ready)
264+
}
260265

261266
return nil
262267
}
@@ -279,7 +284,10 @@ func Convert_v1alpha3_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *Doc
279284
if out.Initialization == nil {
280285
out.Initialization = &infrav1.DockerClusterInitializationStatus{}
281286
}
282-
out.Initialization.Provisioned = ptr.To(in.Ready)
287+
288+
if in.Ready {
289+
out.Initialization.Provisioned = ptr.To(in.Ready)
290+
}
283291

284292
// Move FailureDomains
285293
if in.FailureDomains != nil {

‎test/infrastructure/docker/api/v1alpha4/conversion.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ func (src *DockerCluster) ConvertTo(dstRaw conversion.Hub) error {
5050
}
5151

5252
dst.Status.Conditions = restored.Status.Conditions
53+
dst.Status.Initialization = restored.Status.Initialization
5354

5455
return nil
5556
}
@@ -123,6 +124,7 @@ func (src *DockerMachine) ConvertTo(dstRaw conversion.Hub) error {
123124
}
124125

125126
dst.Status.Conditions = restored.Status.Conditions
127+
dst.Status.Initialization = restored.Status.Initialization
126128

127129
return nil
128130
}
@@ -285,7 +287,10 @@ func Convert_v1alpha4_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *Doc
285287
if out.Initialization == nil {
286288
out.Initialization = &infrav1.DockerMachineInitializationStatus{}
287289
}
288-
out.Initialization.Provisioned = ptr.To(in.Ready)
290+
291+
if in.Ready {
292+
out.Initialization.Provisioned = ptr.To(in.Ready)
293+
}
289294

290295
return nil
291296
}
@@ -308,7 +313,10 @@ func Convert_v1alpha4_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *Doc
308313
if out.Initialization == nil {
309314
out.Initialization = &infrav1.DockerClusterInitializationStatus{}
310315
}
311-
out.Initialization.Provisioned = ptr.To(in.Ready)
316+
317+
if in.Ready {
318+
out.Initialization.Provisioned = ptr.To(in.Ready)
319+
}
312320

313321
// Move FailureDomains
314322
if in.FailureDomains != nil {

‎test/infrastructure/docker/api/v1beta1/conversion.go

Lines changed: 101 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,38 @@ import (
2929
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
3030
clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
3131
infrav1 "sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta2"
32+
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
3233
)
3334

3435
func (src *DockerCluster) ConvertTo(dstRaw conversion.Hub) error {
3536
dst := dstRaw.(*infrav1.DockerCluster)
3637

37-
return Convert_v1beta1_DockerCluster_To_v1beta2_DockerCluster(src, dst, nil)
38+
if err := Convert_v1beta1_DockerCluster_To_v1beta2_DockerCluster(src, dst, nil); err != nil {
39+
return err
40+
}
41+
42+
restored := &infrav1.DockerCluster{}
43+
if ok, err := utilconversion.UnmarshalData(dst, restored); err != nil || !ok {
44+
return err
45+
}
46+
47+
dst.Status.Initialization = restored.Status.Initialization
48+
49+
return nil
3850
}
3951

4052
func (dst *DockerCluster) ConvertFrom(srcRaw conversion.Hub) error {
4153
src := srcRaw.(*infrav1.DockerCluster)
4254

43-
return Convert_v1beta2_DockerCluster_To_v1beta1_DockerCluster(src, dst, nil)
55+
if err := Convert_v1beta2_DockerCluster_To_v1beta1_DockerCluster(src, dst, nil); err != nil {
56+
return err
57+
}
58+
59+
if err := utilconversion.MarshalData(src, dst); err != nil {
60+
return err
61+
}
62+
63+
return nil
4464
}
4565

4666
func (src *DockerClusterTemplate) ConvertTo(dstRaw conversion.Hub) error {
@@ -58,13 +78,32 @@ func (dst *DockerClusterTemplate) ConvertFrom(srcRaw conversion.Hub) error {
5878
func (src *DockerMachine) ConvertTo(dstRaw conversion.Hub) error {
5979
dst := dstRaw.(*infrav1.DockerMachine)
6080

61-
return Convert_v1beta1_DockerMachine_To_v1beta2_DockerMachine(src, dst, nil)
81+
if err := Convert_v1beta1_DockerMachine_To_v1beta2_DockerMachine(src, dst, nil); err != nil {
82+
return err
83+
}
84+
85+
restored := &infrav1.DockerMachine{}
86+
if ok, err := utilconversion.UnmarshalData(dst, restored); err != nil || !ok {
87+
return err
88+
}
89+
90+
dst.Status.Initialization = restored.Status.Initialization
91+
92+
return nil
6293
}
6394

6495
func (dst *DockerMachine) ConvertFrom(srcRaw conversion.Hub) error {
6596
src := srcRaw.(*infrav1.DockerMachine)
6697

67-
return Convert_v1beta2_DockerMachine_To_v1beta1_DockerMachine(src, dst, nil)
98+
if err := Convert_v1beta2_DockerMachine_To_v1beta1_DockerMachine(src, dst, nil); err != nil {
99+
return err
100+
}
101+
102+
if err := utilconversion.MarshalData(src, dst); err != nil {
103+
return err
104+
}
105+
106+
return nil
68107
}
69108

70109
func (src *DockerMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
@@ -82,13 +121,32 @@ func (dst *DockerMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
82121
func (src *DevCluster) ConvertTo(dstRaw conversion.Hub) error {
83122
dst := dstRaw.(*infrav1.DevCluster)
84123

85-
return Convert_v1beta1_DevCluster_To_v1beta2_DevCluster(src, dst, nil)
124+
if err := Convert_v1beta1_DevCluster_To_v1beta2_DevCluster(src, dst, nil); err != nil {
125+
return err
126+
}
127+
128+
restored := &infrav1.DevCluster{}
129+
if ok, err := utilconversion.UnmarshalData(dst, restored); err != nil || !ok {
130+
return err
131+
}
132+
133+
dst.Status.Initialization = restored.Status.Initialization
134+
135+
return nil
86136
}
87137

88138
func (dst *DevCluster) ConvertFrom(srcRaw conversion.Hub) error {
89139
src := srcRaw.(*infrav1.DevCluster)
90140

91-
return Convert_v1beta2_DevCluster_To_v1beta1_DevCluster(src, dst, nil)
141+
if err := Convert_v1beta2_DevCluster_To_v1beta1_DevCluster(src, dst, nil); err != nil {
142+
return err
143+
}
144+
145+
if err := utilconversion.MarshalData(src, dst); err != nil {
146+
return err
147+
}
148+
149+
return nil
92150
}
93151

94152
func (src *DevClusterTemplate) ConvertTo(dstRaw conversion.Hub) error {
@@ -106,13 +164,32 @@ func (dst *DevClusterTemplate) ConvertFrom(srcRaw conversion.Hub) error {
106164
func (src *DevMachine) ConvertTo(dstRaw conversion.Hub) error {
107165
dst := dstRaw.(*infrav1.DevMachine)
108166

109-
return Convert_v1beta1_DevMachine_To_v1beta2_DevMachine(src, dst, nil)
167+
if err := Convert_v1beta1_DevMachine_To_v1beta2_DevMachine(src, dst, nil); err != nil {
168+
return err
169+
}
170+
171+
restored := &infrav1.DevMachine{}
172+
if ok, err := utilconversion.UnmarshalData(dst, restored); err != nil || !ok {
173+
return err
174+
}
175+
176+
dst.Status.Initialization = restored.Status.Initialization
177+
178+
return nil
110179
}
111180

112181
func (dst *DevMachine) ConvertFrom(srcRaw conversion.Hub) error {
113182
src := srcRaw.(*infrav1.DevMachine)
114183

115-
return Convert_v1beta2_DevMachine_To_v1beta1_DevMachine(src, dst, nil)
184+
if err := Convert_v1beta2_DevMachine_To_v1beta1_DevMachine(src, dst, nil); err != nil {
185+
return err
186+
}
187+
188+
if err := utilconversion.MarshalData(src, dst); err != nil {
189+
return err
190+
}
191+
192+
return nil
116193
}
117194

118195
func (src *DevMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
@@ -143,7 +220,10 @@ func Convert_v1beta1_DevClusterStatus_To_v1beta2_DevClusterStatus(in *DevCluster
143220
if out.Initialization == nil {
144221
out.Initialization = &infrav1.DevClusterInitializationStatus{}
145222
}
146-
out.Initialization.Provisioned = ptr.To(in.Ready)
223+
224+
if in.Ready {
225+
out.Initialization.Provisioned = ptr.To(in.Ready)
226+
}
147227

148228
if in.FailureDomains != nil {
149229
out.FailureDomains = []clusterv1.FailureDomain{}
@@ -230,7 +310,10 @@ func Convert_v1beta1_DevMachineStatus_To_v1beta2_DevMachineStatus(in *DevMachine
230310
if out.Initialization == nil {
231311
out.Initialization = &infrav1.DevMachineInitializationStatus{}
232312
}
233-
out.Initialization.Provisioned = ptr.To(in.Ready)
313+
314+
if in.Ready {
315+
out.Initialization.Provisioned = ptr.To(in.Ready)
316+
}
234317

235318
// Reset conditions from autogenerated conversions
236319
// NOTE: v1beta1 conditions should not be automatically be converted into v1beta2 conditions.
@@ -294,7 +377,10 @@ func Convert_v1beta1_DockerClusterStatus_To_v1beta2_DockerClusterStatus(in *Dock
294377
if out.Initialization == nil {
295378
out.Initialization = &infrav1.DockerClusterInitializationStatus{}
296379
}
297-
out.Initialization.Provisioned = ptr.To(in.Ready)
380+
381+
if in.Ready {
382+
out.Initialization.Provisioned = ptr.To(in.Ready)
383+
}
298384

299385
if in.FailureDomains != nil {
300386
out.FailureDomains = []clusterv1.FailureDomain{}
@@ -381,7 +467,10 @@ func Convert_v1beta1_DockerMachineStatus_To_v1beta2_DockerMachineStatus(in *Dock
381467
if out.Initialization == nil {
382468
out.Initialization = &infrav1.DockerMachineInitializationStatus{}
383469
}
384-
out.Initialization.Provisioned = ptr.To(in.Ready)
470+
471+
if in.Ready {
472+
out.Initialization.Provisioned = ptr.To(in.Ready)
473+
}
385474

386475
// Reset conditions from autogenerated conversions
387476
// NOTE: v1beta1 conditions should not be automatically be converted into v1beta2 conditions.

0 commit comments

Comments
 (0)