Merge pull request #12292 from chrischdi/pr-kcp-fix-nilpointer

k8s-ci-robot · web-flow · commit aeb3c3ba81c3 · 2025-05-26T09:32:21.000-07:00
🐛 KCP: fix nil pointer in conversion
diff --git a/api/controlplane/kubeadm/v1beta1/conversion.go b/api/controlplane/kubeadm/v1beta1/conversion.go
@@ -81,7 +81,7 @@ func Convert_v1beta2_KubeadmControlPlaneStatus_To_v1beta1_KubeadmControlPlaneSta
 	if in.Initialization != nil {
 		out.Initialized = in.Initialization.ControlPlaneInitialized
 	}
-	out.Ready = in.Deprecated.V1Beta1.ReadyReplicas > 0
+	out.Ready = out.ReadyReplicas > 0
 
 	// Move new conditions (v1beta2) and replica counter to the v1beta2 field.
 	if in.Conditions == nil && in.ReadyReplicas == nil && in.AvailableReplicas == nil && in.UpToDateReplicas == nil {
diff --git a/internal/apis/controlplane/kubeadm/v1alpha3/conversion.go b/internal/apis/controlplane/kubeadm/v1alpha3/conversion.go
@@ -126,7 +126,7 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
 	if src.Status.Initialization != nil {
 		dst.Status.Initialized = src.Status.Initialization.ControlPlaneInitialized
 	}
-	dst.Status.Ready = src.Status.Deprecated.V1Beta1.ReadyReplicas > 0
+	dst.Status.Ready = dst.Status.ReadyReplicas > 0
 
 	// Preserve Hub data on down-conversion except for metadata
 	if err := utilconversion.MarshalData(src, dst); err != nil {
diff --git a/internal/apis/controlplane/kubeadm/v1alpha4/conversion.go b/internal/apis/controlplane/kubeadm/v1alpha4/conversion.go
@@ -124,7 +124,7 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
 	if src.Status.Initialization != nil {
 		dst.Status.Initialized = src.Status.Initialization.ControlPlaneInitialized
 	}
-	dst.Status.Ready = src.Status.Deprecated.V1Beta1.ReadyReplicas > 0
+	dst.Status.Ready = dst.Status.ReadyReplicas > 0
 
 	// Preserve Hub data on down-conversion except for metadata
 	return utilconversion.MarshalData(src, dst)

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func Convert_v1beta2_KubeadmControlPlaneStatus_To_v1beta1_KubeadmControlPlaneSta`
`81`	`81`	`if in.Initialization != nil {`
`82`	`82`	`out.Initialized = in.Initialization.ControlPlaneInitialized`
`83`	`83`	`}`
`84`		`- out.Ready = in.Deprecated.V1Beta1.ReadyReplicas > 0`
	`84`	`+ out.Ready = out.ReadyReplicas > 0`
`85`	`85`
`86`	`86`	`// Move new conditions (v1beta2) and replica counter to the v1beta2 field.`
`87`	`87`	`if in.Conditions == nil && in.ReadyReplicas == nil && in.AvailableReplicas == nil && in.UpToDateReplicas == nil {`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {`
`126`	`126`	`if src.Status.Initialization != nil {`
`127`	`127`	`dst.Status.Initialized = src.Status.Initialization.ControlPlaneInitialized`
`128`	`128`	`}`
`129`		`- dst.Status.Ready = src.Status.Deprecated.V1Beta1.ReadyReplicas > 0`
	`129`	`+ dst.Status.Ready = dst.Status.ReadyReplicas > 0`
`130`	`130`
`131`	`131`	`// Preserve Hub data on down-conversion except for metadata`
`132`	`132`	`if err := utilconversion.MarshalData(src, dst); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ func (dst *KubeadmControlPlane) ConvertFrom(srcRaw conversion.Hub) error {`
`124`	`124`	`if src.Status.Initialization != nil {`
`125`	`125`	`dst.Status.Initialized = src.Status.Initialization.ControlPlaneInitialized`
`126`	`126`	`}`
`127`		`- dst.Status.Ready = src.Status.Deprecated.V1Beta1.ReadyReplicas > 0`
	`127`	`+ dst.Status.Ready = dst.Status.ReadyReplicas > 0`
`128`	`128`
`129`	`129`	`// Preserve Hub data on down-conversion except for metadata`
`130`	`130`	`return utilconversion.MarshalData(src, dst)`