Skip to content

Commit 6a747a3

Browse files
fabriziopandinifabriziopandini
authored
🌱 Drop usage of v1beta1 conditions (#12109)
* Accept usage of clusterv1.ResizedV1Beta1Condition (it is for v1beta1 conditions management only) * Stop using clusterv1.ClusterClassVariablesReconciledV1Beta1Condition in controllers * Stop using clusterv1.TopologyReconciledV1Beta1Condition in controllers * Stop using clusterv1.MachineNodeHealthyV1Beta1Condition in controllers # Conflicts: # internal/controllers/machine/machine_controller_test.go * Stop using clusterv1.PreTerminateDeleteHookSucceededV1Beta1Condition in controllers * Stop using clusterv1.DrainingSucceededV1Beta1Condition in controllers * Stop using clusterv1.VolumeDetachSucceededV1Beta1Condition in controllers * Stop using clusterv1.BootstrapReadyV1Beta1Condition in controllers * Stop using clusterv1.ControlPlaneInitializedV1Beta1Condition in controllers * Stop using clusterv1.InfrastructureReadyV1Beta1Condition in controllers * Stop using clusterv1.ReadyV1Beta1Condition in controllers * Stop using clusterv1.MachineOwnerRemediatedV1Beta1Condition and clusterv1.MachineHealthCheckSucceededV1Beta1Condition in controllers * Stop using clusterv1.bootstrapv1.DataSecretAvailableV1Beta1Condition in controllers * Stop using controlplanev1.KubeadmControlPlaneMachine*HealthyCondition in controllers * Stop using controlplanev1.controlplanev1.AvailableV1Beta1Condition in controllers * Stop using controlplanev1..EtcdClusterHealthyV1Beta1Condition and controlplanev1.ControlPlaneComponentsHealthyV1Beta1Condition in controllers * Drop unnecessary TODO * Small cleanups * Fix tests * Address comments * More comments
1 parent 8a935c4 commit 6a747a3

File tree

68 files changed

+1208
-1394
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1208
-1394
lines changed

‎bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,7 @@ func (r *KubeadmConfigReconciler) reconcile(ctx context.Context, scope *Scope, c
358358
}
359359

360360
// Note: can't use IsFalse here because we need to handle the absence of the condition as well as false.
361-
// TODO (v1beta2): test for v1beta2 conditions
362-
if !v1beta1conditions.IsTrue(cluster, clusterv1.ControlPlaneInitializedV1Beta1Condition) {
361+
if !conditions.IsTrue(cluster, clusterv1.ClusterControlPlaneInitializedCondition) {
363362
return r.handleClusterNotInitialized(ctx, scope)
364363
}
365364

@@ -483,8 +482,7 @@ func (r *KubeadmConfigReconciler) handleClusterNotInitialized(ctx context.Contex
483482
// initialize the DataSecretAvailableCondition if missing.
484483
// this is required in order to avoid the condition's LastTransitionTime to flicker in case of errors surfacing
485484
// using the DataSecretGeneratedFailedReason
486-
// TODO (v1beta2): test for v1beta2 conditions
487-
if v1beta1conditions.GetReason(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition) != bootstrapv1.DataSecretGenerationFailedV1Beta1Reason {
485+
if !conditions.Has(scope.Config, bootstrapv1.KubeadmConfigDataSecretAvailableCondition) {
488486
v1beta1conditions.MarkFalse(scope.Config, bootstrapv1.DataSecretAvailableV1Beta1Condition, clusterv1.WaitingForControlPlaneAvailableV1Beta1Reason, clusterv1.ConditionSeverityInfo, "")
489487
conditions.Set(scope.Config, metav1.Condition{
490488
Type: bootstrapv1.KubeadmConfigDataSecretAvailableCondition,

‎bootstrap/kubeadm/internal/controllers/kubeadmconfig_controller_test.go

Lines changed: 30 additions & 35 deletions
Large diffs are not rendered by default.

‎cmd/clusterctl/client/cluster/mover.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import (
4040
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta2"
4141
clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
4242
logf "sigs.k8s.io/cluster-api/cmd/clusterctl/log"
43-
v1beta1conditions "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"
43+
"sigs.k8s.io/cluster-api/util/conditions"
4444
"sigs.k8s.io/cluster-api/util/patch"
4545
"sigs.k8s.io/cluster-api/util/yaml"
4646
)
@@ -246,8 +246,7 @@ func (o *objectMover) checkProvisioningCompleted(ctx context.Context, graph *obj
246246
}
247247

248248
// Note: can't use IsFalse here because we need to handle the absence of the condition as well as false.
249-
// TODO (v1beta2): test for v1beta2 conditions
250-
if !v1beta1conditions.IsTrue(clusterObj, clusterv1.ControlPlaneInitializedV1Beta1Condition) {
249+
if !conditions.IsTrue(clusterObj, clusterv1.ClusterControlPlaneInitializedCondition) {
251250
errList = append(errList, errors.Errorf("cannot start the move operation while the control plane for %q %s/%s is not yet initialized", clusterObj.GroupVersionKind(), clusterObj.GetNamespace(), clusterObj.GetName()))
252251
continue
253252
}

‎cmd/clusterctl/client/cluster/mover_test.go

Lines changed: 10 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ import (
4242
clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
4343
"sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test"
4444
"sigs.k8s.io/cluster-api/cmd/clusterctl/internal/test/providers/infrastructure"
45-
v1beta1conditions "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"
4645
)
4746

4847
type moveTestsFields struct {
@@ -1461,12 +1460,8 @@ func Test_objectMover_checkProvisioningCompleted(t *testing.T) {
14611460
},
14621461
Status: clusterv1.ClusterStatus{
14631462
Initialization: &clusterv1.ClusterInitializationStatus{InfrastructureProvisioned: false},
1464-
Deprecated: &clusterv1.ClusterDeprecatedStatus{
1465-
V1Beta1: &clusterv1.ClusterV1Beta1DeprecatedStatus{
1466-
Conditions: clusterv1.Conditions{
1467-
*v1beta1conditions.TrueCondition(clusterv1.ControlPlaneInitializedV1Beta1Condition),
1468-
},
1469-
},
1463+
Conditions: []metav1.Condition{
1464+
{Type: clusterv1.ClusterControlPlaneInitializedCondition, Status: metav1.ConditionTrue},
14701465
},
14711466
},
14721467
},
@@ -1510,12 +1505,8 @@ func Test_objectMover_checkProvisioningCompleted(t *testing.T) {
15101505
},
15111506
Status: clusterv1.ClusterStatus{
15121507
Initialization: &clusterv1.ClusterInitializationStatus{InfrastructureProvisioned: true},
1513-
Deprecated: &clusterv1.ClusterDeprecatedStatus{
1514-
V1Beta1: &clusterv1.ClusterV1Beta1DeprecatedStatus{
1515-
Conditions: clusterv1.Conditions{
1516-
*v1beta1conditions.FalseCondition(clusterv1.ControlPlaneInitializedV1Beta1Condition, "", clusterv1.ConditionSeverityInfo, ""),
1517-
},
1518-
},
1508+
Conditions: []metav1.Condition{
1509+
{Type: clusterv1.ClusterControlPlaneInitializedCondition, Status: metav1.ConditionFalse},
15191510
},
15201511
},
15211512
},
@@ -1541,12 +1532,8 @@ func Test_objectMover_checkProvisioningCompleted(t *testing.T) {
15411532
},
15421533
Status: clusterv1.ClusterStatus{
15431534
Initialization: &clusterv1.ClusterInitializationStatus{InfrastructureProvisioned: true},
1544-
Deprecated: &clusterv1.ClusterDeprecatedStatus{
1545-
V1Beta1: &clusterv1.ClusterV1Beta1DeprecatedStatus{
1546-
Conditions: clusterv1.Conditions{
1547-
*v1beta1conditions.TrueCondition(clusterv1.ControlPlaneInitializedV1Beta1Condition),
1548-
},
1549-
},
1535+
Conditions: []metav1.Condition{
1536+
{Type: clusterv1.ClusterControlPlaneInitializedCondition, Status: metav1.ConditionTrue},
15501537
},
15511538
},
15521539
},
@@ -1570,12 +1557,8 @@ func Test_objectMover_checkProvisioningCompleted(t *testing.T) {
15701557
},
15711558
Status: clusterv1.ClusterStatus{
15721559
Initialization: &clusterv1.ClusterInitializationStatus{InfrastructureProvisioned: true},
1573-
Deprecated: &clusterv1.ClusterDeprecatedStatus{
1574-
V1Beta1: &clusterv1.ClusterV1Beta1DeprecatedStatus{
1575-
Conditions: clusterv1.Conditions{
1576-
*v1beta1conditions.TrueCondition(clusterv1.ControlPlaneInitializedV1Beta1Condition),
1577-
},
1578-
},
1560+
Conditions: []metav1.Condition{
1561+
{Type: clusterv1.ClusterControlPlaneInitializedCondition, Status: metav1.ConditionTrue},
15791562
},
15801563
},
15811564
},
@@ -1620,12 +1603,8 @@ func Test_objectMover_checkProvisioningCompleted(t *testing.T) {
16201603
},
16211604
Status: clusterv1.ClusterStatus{
16221605
Initialization: &clusterv1.ClusterInitializationStatus{InfrastructureProvisioned: true, ControlPlaneInitialized: true},
1623-
Deprecated: &clusterv1.ClusterDeprecatedStatus{
1624-
V1Beta1: &clusterv1.ClusterV1Beta1DeprecatedStatus{
1625-
Conditions: clusterv1.Conditions{
1626-
*v1beta1conditions.TrueCondition(clusterv1.ControlPlaneInitializedV1Beta1Condition),
1627-
},
1628-
},
1606+
Conditions: []metav1.Condition{
1607+
{Type: clusterv1.ClusterControlPlaneInitializedCondition, Status: metav1.ConditionTrue},
16291608
},
16301609
},
16311610
},

‎cmd/clusterctl/client/tree/tree.go

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -97,17 +97,17 @@ func (od ObjectTree) Add(parent, obj client.Object, opts ...AddObjectOption) (ad
9797

9898
// Get a small set of conditions that will be used to determine e.g. when grouping or when an object is just an echo of
9999
// its parent.
100-
var objReady, parentReady *clusterv1.Condition
101-
var objAvailableV1Beta2, objReadyV1Beta2, objUpToDateV1Beta2, parentReadyV1Beta2 *metav1.Condition
100+
var objReadyV1Beta1, parentReadyV1Beta1 *clusterv1.Condition
101+
var objAvailable, objReady, objUpToDate, parentReady *metav1.Condition
102102
switch od.options.V1Beta2 {
103103
case true:
104-
objAvailableV1Beta2 = GetAvailableV1Beta2Condition(obj)
105-
objReadyV1Beta2 = GetReadyV1Beta2Condition(obj)
106-
objUpToDateV1Beta2 = GetMachineUpToDateV1Beta2Condition(obj)
107-
parentReadyV1Beta2 = GetReadyV1Beta2Condition(parent)
108-
default:
104+
objAvailable = GetAvailableCondition(obj)
109105
objReady = GetReadyCondition(obj)
106+
objUpToDate = GetMachineUpToDateCondition(obj)
110107
parentReady = GetReadyCondition(parent)
108+
default:
109+
objReadyV1Beta1 = GetV1Beta1ReadyCondition(obj)
110+
parentReadyV1Beta1 = GetV1Beta1ReadyCondition(parent)
111111
}
112112

113113
// If it is requested to show all the conditions for the object, add
@@ -121,11 +121,11 @@ func (od ObjectTree) Add(parent, obj client.Object, opts ...AddObjectOption) (ad
121121
if addOpts.NoEcho && !od.options.Echo {
122122
switch od.options.V1Beta2 {
123123
case true:
124-
if (objReadyV1Beta2 != nil && objReadyV1Beta2.Status == metav1.ConditionTrue) || hasSameAvailableReadyUptoDateStatusAndReason(nil, nil, parentReadyV1Beta2, objReadyV1Beta2, nil, nil) {
124+
if (objReady != nil && objReady.Status == metav1.ConditionTrue) || hasSameAvailableReadyUptoDateStatusAndReason(nil, nil, parentReady, objReady, nil, nil) {
125125
return false, false
126126
}
127127
default:
128-
if (objReady != nil && objReady.Status == corev1.ConditionTrue) || hasSameReadyStatusSeverityAndReason(parentReady, objReady) {
128+
if (objReadyV1Beta1 != nil && objReadyV1Beta1.Status == corev1.ConditionTrue) || hasSameReadyStatusSeverityAndReason(parentReadyV1Beta1, objReadyV1Beta1) {
129129
return false, false
130130
}
131131
}
@@ -154,24 +154,24 @@ func (od ObjectTree) Add(parent, obj client.Object, opts ...AddObjectOption) (ad
154154
for i := range siblings {
155155
s := siblings[i]
156156

157-
var sReady *clusterv1.Condition
158-
var sAvailableV1Beta2, sReadyV1Beta2, sUpToDateV1Beta2 *metav1.Condition
157+
var sReadyV1Beta1 *clusterv1.Condition
158+
var sAvailable, sReady, sUpToDate *metav1.Condition
159159
switch od.options.V1Beta2 {
160160
case true:
161161
// If the object's ready condition has a different Available/ReadyUpToDate condition than the sibling object,
162162
// move on (they should not be grouped).
163-
sAvailableV1Beta2 = GetAvailableV1Beta2Condition(s)
164-
sReadyV1Beta2 = GetReadyV1Beta2Condition(s)
165-
sUpToDateV1Beta2 = GetMachineUpToDateV1Beta2Condition(s)
166-
if !hasSameAvailableReadyUptoDateStatusAndReason(objAvailableV1Beta2, sAvailableV1Beta2, objReadyV1Beta2, sReadyV1Beta2, objUpToDateV1Beta2, sUpToDateV1Beta2) {
163+
sAvailable = GetAvailableCondition(s)
164+
sReady = GetReadyCondition(s)
165+
sUpToDate = GetMachineUpToDateCondition(s)
166+
if !hasSameAvailableReadyUptoDateStatusAndReason(objAvailable, sAvailable, objReady, sReady, objUpToDate, sUpToDate) {
167167
continue
168168
}
169169
default:
170-
sReady = GetReadyCondition(s)
170+
sReadyV1Beta1 = GetV1Beta1ReadyCondition(s)
171171

172172
// If the object's ready condition has a different Status, Severity and Reason than the sibling object,
173173
// move on (they should not be grouped).
174-
if !hasSameReadyStatusSeverityAndReason(objReady, sReady) {
174+
if !hasSameReadyStatusSeverityAndReason(objReadyV1Beta1, sReadyV1Beta1) {
175175
continue
176176
}
177177
}
@@ -183,9 +183,9 @@ func (od ObjectTree) Add(parent, obj client.Object, opts ...AddObjectOption) (ad
183183
if s.GetObjectKind().GroupVersionKind().Kind == obj.GetObjectKind().GroupVersionKind().Kind+"Group" {
184184
switch od.options.V1Beta2 {
185185
case true:
186-
updateGroupNode(s, sReadyV1Beta2, obj, objAvailableV1Beta2, objReadyV1Beta2, objUpToDateV1Beta2)
186+
updateGroupNode(s, sReady, obj, objAvailable, objReady, objUpToDate)
187187
default:
188-
updateV1Beta1GroupNode(s, sReady, obj, objReady)
188+
updateV1Beta1GroupNode(s, sReadyV1Beta1, obj, objReadyV1Beta1)
189189
}
190190

191191
return true, false
@@ -201,9 +201,9 @@ func (od ObjectTree) Add(parent, obj client.Object, opts ...AddObjectOption) (ad
201201
var groupNode *NodeObject
202202
switch od.options.V1Beta2 {
203203
case true:
204-
groupNode = createGroupNode(s, sReadyV1Beta2, obj, objAvailableV1Beta2, objReadyV1Beta2, objUpToDateV1Beta2)
204+
groupNode = createGroupNode(s, sReady, obj, objAvailable, objReady, objUpToDate)
205205
default:
206-
groupNode = createV1Beta1GroupNode(s, sReady, obj, objReady)
206+
groupNode = createV1Beta1GroupNode(s, sReadyV1Beta1, obj, objReadyV1Beta1)
207207
}
208208

209209
// By default, grouping objects should be sorted last.
@@ -332,7 +332,7 @@ func createGroupNode(sibling client.Object, siblingReady *metav1.Condition, obj
332332
if objAvailable != nil {
333333
objAvailable.LastTransitionTime = metav1.Time{}
334334
objAvailable.Message = ""
335-
setAvailableV1Beta2Condition(groupNode, objAvailable)
335+
setAvailableCondition(groupNode, objAvailable)
336336
if objAvailable.Status == metav1.ConditionTrue {
337337
// When creating a group, it is already the sum of obj and its own sibling,
338338
// and they all have same conditions.
@@ -345,7 +345,7 @@ func createGroupNode(sibling client.Object, siblingReady *metav1.Condition, obj
345345
if objReady != nil {
346346
objReady.LastTransitionTime = minLastTransitionTime(objReady, siblingReady)
347347
objReady.Message = ""
348-
setReadyV1Beta2Condition(groupNode, objReady)
348+
setReadyCondition(groupNode, objReady)
349349
if objReady.Status == metav1.ConditionTrue {
350350
// When creating a group, it is already the sum of obj and its own sibling,
351351
// and they all have same conditions.
@@ -358,7 +358,7 @@ func createGroupNode(sibling client.Object, siblingReady *metav1.Condition, obj
358358
if objUpToDate != nil {
359359
objUpToDate.LastTransitionTime = metav1.Time{}
360360
objUpToDate.Message = ""
361-
setUpToDateV1Beta2Condition(groupNode, objUpToDate)
361+
setUpToDateCondition(groupNode, objUpToDate)
362362
if objUpToDate.Status == metav1.ConditionTrue {
363363
// When creating a group, it is already the sum of obj and its own sibling,
364364
// and they all have same conditions.
@@ -370,7 +370,7 @@ func createGroupNode(sibling client.Object, siblingReady *metav1.Condition, obj
370370
}
371371

372372
func readyStatusReasonUID(obj client.Object) string {
373-
ready := GetReadyV1Beta2Condition(obj)
373+
ready := GetReadyCondition(obj)
374374
if ready == nil {
375375
return fmt.Sprintf("zzz_%s", util.RandomString(6))
376376
}
@@ -417,7 +417,7 @@ func createV1Beta1GroupNode(sibling client.Object, siblingReady *clusterv1.Condi
417417
}
418418

419419
func readyStatusSeverityAndReasonUID(obj client.Object) string {
420-
ready := GetReadyCondition(obj)
420+
ready := GetV1Beta1ReadyCondition(obj)
421421
if ready == nil {
422422
return fmt.Sprintf("zzz_%s", util.RandomString(6))
423423
}
@@ -459,7 +459,7 @@ func updateGroupNode(groupObj client.Object, groupReady *metav1.Condition, obj c
459459
if groupReady != nil {
460460
groupReady.LastTransitionTime = minLastTransitionTime(objReady, groupReady)
461461
groupReady.Message = ""
462-
setReadyV1Beta2Condition(groupObj, groupReady)
462+
setReadyCondition(groupObj, groupReady)
463463
}
464464

465465
if objReady != nil && objReady.Status == metav1.ConditionTrue {

‎cmd/clusterctl/client/tree/tree_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ func Test_createGroupNode(t *testing.T) {
565565
}
566566

567567
g := NewWithT(t)
568-
got := createGroupNode(sibling, GetReadyV1Beta2Condition(sibling), obj, GetAvailableV1Beta2Condition(obj), GetReadyV1Beta2Condition(obj), GetMachineUpToDateV1Beta2Condition(obj))
568+
got := createGroupNode(sibling, GetReadyCondition(sibling), obj, GetAvailableCondition(obj), GetReadyCondition(obj), GetMachineUpToDateCondition(obj))
569569

570570
// Some values are generated randomly, so pick up them.
571571
want.SetName(got.GetName())
@@ -653,7 +653,7 @@ func Test_createV1Beta1GroupNode(t *testing.T) {
653653
}
654654

655655
g := NewWithT(t)
656-
got := createV1Beta1GroupNode(sibling, GetReadyCondition(sibling), obj, GetReadyCondition(obj))
656+
got := createV1Beta1GroupNode(sibling, GetV1Beta1ReadyCondition(sibling), obj, GetV1Beta1ReadyCondition(obj))
657657

658658
// Some values are generated randomly, so pick up them.
659659
want.SetName(got.GetName())
@@ -738,7 +738,7 @@ func Test_updateGroupNode(t *testing.T) {
738738
}
739739

740740
g := NewWithT(t)
741-
updateGroupNode(group, GetReadyV1Beta2Condition(group), obj, GetAvailableV1Beta2Condition(obj), GetReadyV1Beta2Condition(obj), GetMachineUpToDateV1Beta2Condition(obj))
741+
updateGroupNode(group, GetReadyCondition(group), obj, GetAvailableCondition(obj), GetReadyCondition(obj), GetMachineUpToDateCondition(obj))
742742

743743
g.Expect(group).To(BeComparableTo(want))
744744
}
@@ -827,7 +827,7 @@ func Test_updateV1Beta1GroupNode(t *testing.T) {
827827
}
828828

829829
g := NewWithT(t)
830-
updateV1Beta1GroupNode(group, GetReadyCondition(group), obj, GetReadyCondition(obj))
830+
updateV1Beta1GroupNode(group, GetV1Beta1ReadyCondition(group), obj, GetV1Beta1ReadyCondition(obj))
831831

832832
g.Expect(group).To(BeComparableTo(want))
833833
}

‎cmd/clusterctl/client/tree/util.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import (
3535
// GroupVersionVirtualObject is the group version for VirtualObject.
3636
var GroupVersionVirtualObject = schema.GroupVersion{Group: "virtual.cluster.x-k8s.io", Version: clusterv1.GroupVersion.Version}
3737

38-
// GetReadyV1Beta2Condition returns the ReadyCondition for an object, if defined.
39-
func GetReadyV1Beta2Condition(obj client.Object) *metav1.Condition {
38+
// GetReadyCondition returns the ReadyCondition for an object, if defined.
39+
func GetReadyCondition(obj client.Object) *metav1.Condition {
4040
if getter, ok := obj.(conditions.Getter); ok {
4141
return conditions.Get(getter, clusterv1.ReadyCondition)
4242
}
@@ -52,8 +52,8 @@ func GetReadyV1Beta2Condition(obj client.Object) *metav1.Condition {
5252
return nil
5353
}
5454

55-
// GetAvailableV1Beta2Condition returns the AvailableCondition for an object, if defined.
56-
func GetAvailableV1Beta2Condition(obj client.Object) *metav1.Condition {
55+
// GetAvailableCondition returns the AvailableCondition for an object, if defined.
56+
func GetAvailableCondition(obj client.Object) *metav1.Condition {
5757
if getter, ok := obj.(conditions.Getter); ok {
5858
return conditions.Get(getter, clusterv1.AvailableCondition)
5959
}
@@ -69,26 +69,26 @@ func GetAvailableV1Beta2Condition(obj client.Object) *metav1.Condition {
6969
return nil
7070
}
7171

72-
// GetMachineUpToDateV1Beta2Condition returns machine's UpToDate condition, if defined.
72+
// GetMachineUpToDateCondition returns machine's UpToDate condition, if defined.
7373
// Note: The UpToDate condition only exist on machines, so no need to support reading from unstructured.
74-
func GetMachineUpToDateV1Beta2Condition(obj client.Object) *metav1.Condition {
74+
func GetMachineUpToDateCondition(obj client.Object) *metav1.Condition {
7575
if getter, ok := obj.(conditions.Getter); ok {
7676
return conditions.Get(getter, clusterv1.MachineUpToDateCondition)
7777
}
7878
return nil
7979
}
8080

81-
// GetReadyCondition returns the ReadyCondition for an object, if defined.
82-
func GetReadyCondition(obj client.Object) *clusterv1.Condition {
81+
// GetV1Beta1ReadyCondition returns the ReadyCondition for an object, if defined.
82+
func GetV1Beta1ReadyCondition(obj client.Object) *clusterv1.Condition {
8383
getter := objToGetter(obj)
8484
if getter == nil {
8585
return nil
8686
}
8787
return v1beta1conditions.Get(getter, clusterv1.ReadyV1Beta1Condition)
8888
}
8989

90-
// GetAllV1Beta2Conditions returns the other conditions (all the conditions except ready) for an object, if defined.
91-
func GetAllV1Beta2Conditions(obj client.Object) []metav1.Condition {
90+
// GetConditions returns conditions for an object, if defined.
91+
func GetConditions(obj client.Object) []metav1.Condition {
9292
if getter, ok := obj.(conditions.Getter); ok {
9393
return getter.GetConditions()
9494
}
@@ -104,8 +104,8 @@ func GetAllV1Beta2Conditions(obj client.Object) []metav1.Condition {
104104
return nil
105105
}
106106

107-
// GetOtherConditions returns the other conditions (all the conditions except ready) for an object, if defined.
108-
func GetOtherConditions(obj client.Object) []*clusterv1.Condition {
107+
// GetOtherV1Beta1Conditions returns the other conditions (all the conditions except ready) for an object, if defined.
108+
func GetOtherV1Beta1Conditions(obj client.Object) []*clusterv1.Condition {
109109
getter := objToGetter(obj)
110110
if getter == nil {
111111
return nil
@@ -122,19 +122,19 @@ func GetOtherConditions(obj client.Object) []*clusterv1.Condition {
122122
return conditions
123123
}
124124

125-
func setAvailableV1Beta2Condition(obj client.Object, available *metav1.Condition) {
125+
func setAvailableCondition(obj client.Object, available *metav1.Condition) {
126126
if setter, ok := obj.(conditions.Setter); ok {
127127
conditions.Set(setter, *available)
128128
}
129129
}
130130

131-
func setReadyV1Beta2Condition(obj client.Object, ready *metav1.Condition) {
131+
func setReadyCondition(obj client.Object, ready *metav1.Condition) {
132132
if setter, ok := obj.(conditions.Setter); ok {
133133
conditions.Set(setter, *ready)
134134
}
135135
}
136136

137-
func setUpToDateV1Beta2Condition(obj client.Object, upToDate *metav1.Condition) {
137+
func setUpToDateCondition(obj client.Object, upToDate *metav1.Condition) {
138138
if setter, ok := obj.(conditions.Setter); ok {
139139
conditions.Set(setter, *upToDate)
140140
}

0 commit comments

Comments
 (0)