Merge pull request #11523 from k8s-infra-cherrypick-robot/cherry-pick…

…-11518-to-release-1.9 [release-1.9] 🌱 Drop unused v1beta2 conditions and reasons
kubernetes-sigs · Dec 2, 2024 · 6e36999 · 6e36999
2 parents fea33f6 + 5350925
commit 6e36999
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/controlplane/kubeadm/api/v1beta1/v1beta2_condition_consts.go b/controlplane/kubeadm/api/v1beta1/v1beta2_condition_consts.go
@@ -186,9 +186,6 @@ const (
 
 	// KubeadmControlPlaneNotRollingOutV1Beta2Reason surfaces when all the machines are up-to-date.
 	KubeadmControlPlaneNotRollingOutV1Beta2Reason = clusterv1.NotRollingOutV1Beta2Reason
-
-	// KubeadmControlPlaneRollingOutInternalErrorV1Beta2Reason surfaces unexpected failures when listing machines.
-	KubeadmControlPlaneRollingOutInternalErrorV1Beta2Reason = clusterv1.InternalErrorV1Beta2Reason
 )
 
 // KubeadmControlPlane's ScalingUp condition and corresponding reasons that will be used in v1Beta2 API version.

diff --git a/exp/api/v1beta1/v1beta2_condition_consts.go b/exp/api/v1beta1/v1beta2_condition_consts.go
@@ -16,7 +16,10 @@ limitations under the License.
 
 package v1beta1
 
-import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+/*
+NOTE: we are commenting const for MachinePool's V1Beta2 conditions and reasons because not yet implemented for the 1.9 CAPI release.
+However, we are keeping the v1beta2 struct in the MachinePool struct because the code that will collect conditions and replica
+counters at cluster level is already implemented.
 
 // Conditions that will be used for the MachinePool object in v1Beta2 API version.
 const (
@@ -46,4 +49,5 @@ const (
 
 	// MachinePoolDeletingV1Beta2Condition surfaces details about ongoing deletion of the controlled machines.
 	MachinePoolDeletingV1Beta2Condition = clusterv1.DeletingV1Beta2Condition
-)
+).
+*/