Skip to content

Commit f6517d3

Browse files
committed
SUS-681 Additional Fixes
1 parent ed00c20 commit f6517d3

File tree

4 files changed

+21
-10
lines changed

4 files changed

+21
-10
lines changed

bootstrap/kubeadm/api/v1alpha4/conversion.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,12 @@ func Convert_v1beta1_InitConfiguration_To_v1alpha4_InitConfiguration(in *bootstr
165165
return autoConvert_v1beta1_InitConfiguration_To_v1alpha4_InitConfiguration(in, out, s)
166166
}
167167

168+
func Convert_v1beta1_NodeRegistrationOptions_To_v1alpha4_NodeRegistrationOptions(in *bootstrapv1.NodeRegistrationOptions, out *NodeRegistrationOptions, s apiconversion.Scope) error {
169+
// NodeRegistrationOptions.ImagePullPolicy does not exit in
170+
// kubeadm v1alpha4 API.
171+
return autoConvert_v1beta1_NodeRegistrationOptions_To_v1alpha4_NodeRegistrationOptions(in, out, s)
172+
}
173+
168174
func Convert_v1beta1_JoinConfiguration_To_v1alpha4_JoinConfiguration(in *bootstrapv1.JoinConfiguration, out *JoinConfiguration, s apiconversion.Scope) error {
169175
// InitConfiguration.Patches does not exist in kubeadm v1alpha4 API.
170176
return autoConvert_v1beta1_JoinConfiguration_To_v1alpha4_JoinConfiguration(in, out, s)

bootstrap/kubeadm/api/v1alpha4/zz_generated.conversion.go

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

bootstrap/kubeadm/types/upstreamv1beta3/conversion.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,8 @@ func Convert_upstreamv1beta3_JoinControlPlane_To_v1beta1_JoinControlPlane(in *Jo
6464
// JoinControlPlane.CertificateKey does not exist in CABPK v1beta1 version, because Cluster API does not use automatic copy certs.
6565
return autoConvert_upstreamv1beta3_JoinControlPlane_To_v1beta1_JoinControlPlane(in, out, s)
6666
}
67+
68+
func Convert_v1beta1_NodeRegistrationOptions_To_upstreamv1beta3_NodeRegistrationOptions(in *bootstrapv1.NodeRegistrationOptions, out *NodeRegistrationOptions, s apimachineryconversion.Scope) error {
69+
// NodeRegistrationOptions.ImagePullSerial does not exist in kubeadm v1beta3, dropping this info.
70+
return autoConvert_v1beta1_NodeRegistrationOptions_To_upstreamv1beta3_NodeRegistrationOptions(in, out, s)
71+
}

bootstrap/kubeadm/types/upstreamv1beta3/zz_generated.conversion.go

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

0 commit comments

Comments
 (0)