Skip to content

Commit b8f9248

Browse files
authored
Merge pull request #11518 from fabriziopandini/drop-unused-v1beta2-conditions-and-reasons
🌱 Drop unused v1beta2 conditions and reasons
2 parents 8513169 + e301623 commit b8f9248

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

controlplane/kubeadm/api/v1beta1/v1beta2_condition_consts.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,6 @@ const (
186186

187187
// KubeadmControlPlaneNotRollingOutV1Beta2Reason surfaces when all the machines are up-to-date.
188188
KubeadmControlPlaneNotRollingOutV1Beta2Reason = clusterv1.NotRollingOutV1Beta2Reason
189-
190-
// KubeadmControlPlaneRollingOutInternalErrorV1Beta2Reason surfaces unexpected failures when listing machines.
191-
KubeadmControlPlaneRollingOutInternalErrorV1Beta2Reason = clusterv1.InternalErrorV1Beta2Reason
192189
)
193190

194191
// KubeadmControlPlane's ScalingUp condition and corresponding reasons that will be used in v1Beta2 API version.

exp/api/v1beta1/v1beta2_condition_consts.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ limitations under the License.
1616

1717
package v1beta1
1818

19-
import clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
19+
/*
20+
NOTE: we are commenting const for MachinePool's V1Beta2 conditions and reasons because not yet implemented for the 1.9 CAPI release.
21+
However, we are keeping the v1beta2 struct in the MachinePool struct because the code that will collect conditions and replica
22+
counters at cluster level is already implemented.
2023
2124
// Conditions that will be used for the MachinePool object in v1Beta2 API version.
2225
const (
@@ -46,4 +49,5 @@ const (
4649
4750
// MachinePoolDeletingV1Beta2Condition surfaces details about ongoing deletion of the controlled machines.
4851
MachinePoolDeletingV1Beta2Condition = clusterv1.DeletingV1Beta2Condition
49-
)
52+
).
53+
*/

0 commit comments

Comments
 (0)