Skip to content

Commit 45b1e3f

Browse files
sbueringerk8s-infra-cherrypick-robot
authored andcommitted
Only try to convert infraRefs if they are set
Signed-off-by: Stefan Büringer [email protected]
1 parent 2d5238d commit 45b1e3f

File tree

6 files changed

+36
-24
lines changed

6 files changed

+36
-24
lines changed

api/controlplane/kubeadm/v1beta1/conversion.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,13 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
9595
return err
9696
}
9797

98-
infraRef, err := convertToObjectReference(&src.Spec.MachineTemplate.Spec.InfrastructureRef, src.Namespace)
99-
if err != nil {
100-
return err
98+
if src.Spec.MachineTemplate.Spec.InfrastructureRef.IsDefined() {
99+
infraRef, err := convertToObjectReference(&src.Spec.MachineTemplate.Spec.InfrastructureRef, src.Namespace)
100+
if err != nil {
101+
return err
102+
}
103+
dst.Spec.MachineTemplate.InfrastructureRef = *infraRef
101104
}
102-
dst.Spec.MachineTemplate.InfrastructureRef = *infraRef
103105

104106
// Convert timeouts moved from one struct to another.
105107
dst.Spec.KubeadmConfigSpec.ConvertFrom(&src.Spec.KubeadmConfigSpec)

api/core/v1beta1/conversion.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2233,11 +2233,13 @@ func convertMachineSpecToContractVersionedObjectReference(src *MachineSpec, dst
22332233
}
22342234

22352235
func convertMachineSpecToObjectReference(src *clusterv1.MachineSpec, dst *MachineSpec, namespace string) error {
2236-
infraRef, err := convertToObjectReference(src.InfrastructureRef, namespace)
2237-
if err != nil {
2238-
return err
2236+
if src.InfrastructureRef.IsDefined() {
2237+
infraRef, err := convertToObjectReference(src.InfrastructureRef, namespace)
2238+
if err != nil {
2239+
return err
2240+
}
2241+
dst.InfrastructureRef = *infraRef
22392242
}
2240-
dst.InfrastructureRef = *infraRef
22412243

22422244
if src.Bootstrap.ConfigRef.IsDefined() {
22432245
bootstrapRef, err := convertToObjectReference(src.Bootstrap.ConfigRef, namespace)

internal/api/controlplane/kubeadm/v1alpha3/conversion.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,13 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
125125
return err
126126
}
127127

128-
infraRef, err := convertToObjectReference(&src.Spec.MachineTemplate.Spec.InfrastructureRef, src.Namespace)
129-
if err != nil {
130-
return err
128+
if src.Spec.MachineTemplate.Spec.InfrastructureRef.IsDefined() {
129+
infraRef, err := convertToObjectReference(&src.Spec.MachineTemplate.Spec.InfrastructureRef, src.Namespace)
130+
if err != nil {
131+
return err
132+
}
133+
dst.Spec.InfrastructureTemplate = *infraRef
131134
}
132-
dst.Spec.InfrastructureTemplate = *infraRef
133135

134136
// Reset conditions from autogenerated conversions
135137
// NOTE: v1beta2 conditions should not be automatically be converted into legacy conditions (v1alpha3).

internal/api/controlplane/kubeadm/v1alpha4/conversion.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,13 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
122122
return err
123123
}
124124

125-
infraRef, err := convertToObjectReference(&src.Spec.MachineTemplate.Spec.InfrastructureRef, src.Namespace)
126-
if err != nil {
127-
return err
125+
if src.Spec.MachineTemplate.Spec.InfrastructureRef.IsDefined() {
126+
infraRef, err := convertToObjectReference(&src.Spec.MachineTemplate.Spec.InfrastructureRef, src.Namespace)
127+
if err != nil {
128+
return err
129+
}
130+
dst.Spec.MachineTemplate.InfrastructureRef = *infraRef
128131
}
129-
dst.Spec.MachineTemplate.InfrastructureRef = *infraRef
130132

131133
// Reset conditions from autogenerated conversions
132134
// NOTE: v1beta2 conditions should not be automatically be converted into legacy conditions (v1alpha4).

internal/api/core/v1alpha3/conversion.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1066,11 +1066,13 @@ func convertMachineSpecToContractVersionedObjectReference(src *MachineSpec, dst
10661066
}
10671067

10681068
func convertMachineSpecToObjectReference(src *clusterv1.MachineSpec, dst *MachineSpec, namespace string) error {
1069-
infraRef, err := convertToObjectReference(src.InfrastructureRef, namespace)
1070-
if err != nil {
1071-
return err
1069+
if src.InfrastructureRef.IsDefined() {
1070+
infraRef, err := convertToObjectReference(src.InfrastructureRef, namespace)
1071+
if err != nil {
1072+
return err
1073+
}
1074+
dst.InfrastructureRef = *infraRef
10721075
}
1073-
dst.InfrastructureRef = *infraRef
10741076

10751077
if src.Bootstrap.ConfigRef.IsDefined() {
10761078
bootstrapRef, err := convertToObjectReference(src.Bootstrap.ConfigRef, namespace)

internal/api/core/v1alpha4/conversion.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1352,11 +1352,13 @@ func convertMachineSpecToContractVersionedObjectReference(src *MachineSpec, dst
13521352
}
13531353

13541354
func convertMachineSpecToObjectReference(src *clusterv1.MachineSpec, dst *MachineSpec, namespace string) error {
1355-
infraRef, err := convertToObjectReference(src.InfrastructureRef, namespace)
1356-
if err != nil {
1357-
return err
1355+
if src.InfrastructureRef.IsDefined() {
1356+
infraRef, err := convertToObjectReference(src.InfrastructureRef, namespace)
1357+
if err != nil {
1358+
return err
1359+
}
1360+
dst.InfrastructureRef = *infraRef
13581361
}
1359-
dst.InfrastructureRef = *infraRef
13601362

13611363
if src.Bootstrap.ConfigRef.IsDefined() {
13621364
bootstrapRef, err := convertToObjectReference(src.Bootstrap.ConfigRef, namespace)

0 commit comments

Comments
 (0)