Skip to content

Commit 17b96b2

Browse files
sivcharisivchari
committed
stop using deprecated status in controller
Signed-off-by: sivchari <[email protected]>
1 parent d1e0fd4 commit 17b96b2

File tree

10 files changed

+79
-126
lines changed

10 files changed

+79
-126
lines changed

‎exp/internal/controllers/machinepool_controller_noderef.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,7 @@ func (r *MachinePoolReconciler) reconcileNodeRefs(ctx context.Context, s *scope)
6464

6565
// Check that the Machine doesn't already have a NodeRefs.
6666
// Return early if there is no work to do.
67-
// TODO (v1beta2) Use new replica counters
68-
readyReplicas := int32(0)
69-
if mp.Status.Deprecated != nil && mp.Status.Deprecated.V1Beta1 != nil {
70-
readyReplicas = mp.Status.Deprecated.V1Beta1.ReadyReplicas
71-
}
67+
readyReplicas := ptr.Deref(mp.Status.ReadyReplicas, 0)
7268
if ptr.Deref(mp.Status.Replicas, 0) == readyReplicas && len(mp.Status.NodeRefs) == int(readyReplicas) {
7369
v1beta1conditions.MarkTrue(mp, clusterv1.ReplicasReadyV1Beta1Condition)
7470
return ctrl.Result{}, nil

‎exp/internal/controllers/machinepool_controller_phases.go‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,7 @@ func (r *MachinePoolReconciler) reconcilePhase(mp *clusterv1.MachinePool) {
6868
}
6969

7070
// Set the phase to "running" if the number of ready replicas is equal to desired replicas.
71-
// TODO (v1beta2) Use new replica counters
72-
readyReplicas := int32(0)
73-
if mp.Status.Deprecated != nil && mp.Status.Deprecated.V1Beta1 != nil {
74-
readyReplicas = mp.Status.Deprecated.V1Beta1.ReadyReplicas
75-
}
71+
readyReplicas := ptr.Deref(mp.Status.ReadyReplicas, 0)
7672
if mp.Status.Initialization != nil && ptr.Deref(mp.Status.Initialization.InfrastructureProvisioned, false) && mp.Spec.Replicas != nil && *mp.Spec.Replicas == readyReplicas {
7773
mp.Status.SetTypedPhase(clusterv1.MachinePoolPhaseRunning)
7874
}

‎test/framework/machinepool_helpers.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,8 @@ func WaitForMachinePoolNodesToExist(ctx context.Context, input WaitForMachinePoo
8686
return 0, err
8787
}
8888

89-
// TODO (v1beta2) Use new replica counters
90-
readyReplicas := 0
91-
if input.MachinePool.Status.Deprecated != nil && input.MachinePool.Status.Deprecated.V1Beta1 != nil {
92-
readyReplicas = int(input.MachinePool.Status.Deprecated.V1Beta1.ReadyReplicas)
93-
}
94-
return readyReplicas, nil
89+
readyReplicas := ptr.Deref(input.MachinePool.Status.ReadyReplicas, 0)
90+
return int(readyReplicas), nil
9591
}, intervals...).Should(Equal(int(*input.MachinePool.Spec.Replicas)), "Timed out waiting for %v ready replicas for MachinePool %s", *input.MachinePool.Spec.Replicas, klog.KObj(input.MachinePool))
9692
}
9793

‎test/infrastructure/docker/exp/internal/controllers/dockermachinepool_controller_phases.go‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
"sigs.k8s.io/cluster-api/test/infrastructure/docker/internal/docker"
3939
"sigs.k8s.io/cluster-api/test/infrastructure/kind"
4040
"sigs.k8s.io/cluster-api/util"
41-
v1beta1conditions "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"
41+
"sigs.k8s.io/cluster-api/util/conditions"
4242
"sigs.k8s.io/cluster-api/util/labels/format"
4343
)
4444

@@ -200,9 +200,8 @@ func (r *DockerMachinePoolReconciler) reconcileDockerMachines(ctx context.Contex
200200
totalReadyMachines := 0
201201
for i := range orderedDockerMachines {
202202
dockerMachine := orderedDockerMachines[i]
203-
// TODO (v1beta2): test for v1beta2 conditions
204203
initialization := dockerMachine.Status.Initialization
205-
if initialization != nil && ptr.Deref(initialization.Provisioned, false) || v1beta1conditions.IsTrue(&dockerMachine, clusterv1.ReadyV1Beta1Condition) {
204+
if initialization != nil && ptr.Deref(initialization.Provisioned, false) || conditions.IsTrue(&dockerMachine, clusterv1.ReadyCondition) {
206205
totalReadyMachines++
207206
}
208207
}
@@ -388,10 +387,9 @@ func (r *DockerMachinePoolReconciler) getDeletionCandidates(ctx context.Context,
388387
}
389388

390389
initialization := dockerMachine.Status.Initialization
391-
// TODO (v1beta2): test for v1beta2 conditions
392390
if !isMachineMatchingInfrastructureSpec(ctx, externalMachine, machinePool, dockerMachinePool) {
393391
outdatedMachines = append(outdatedMachines, dockerMachine)
394-
} else if initialization != nil && ptr.Deref(initialization.Provisioned, false) || v1beta1conditions.IsTrue(&dockerMachine, clusterv1.ReadyV1Beta1Condition) {
392+
} else if initialization != nil && ptr.Deref(initialization.Provisioned, false) || conditions.IsTrue(&dockerMachine, clusterv1.ReadyCondition) {
395393
readyMatchingMachines = append(readyMatchingMachines, dockerMachine)
396394
}
397395
}

‎test/infrastructure/docker/internal/controllers/backends/docker/dockercluster_backend.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ func (r *ClusterBackEndReconciler) ReconcileDelete(ctx context.Context, cluster
142142

143143
// Set the LoadBalancerAvailableCondition reporting delete is started, and requeue in order to make
144144
// this visible to the users.
145-
// TODO (v1beta2): test for v1beta2 conditions
146-
if v1beta1conditions.GetReason(dockerCluster, infrav1.LoadBalancerAvailableV1Beta1Condition) != clusterv1.DeletingV1Beta1Reason {
145+
if conditions.GetReason(dockerCluster, infrav1.DevClusterDockerLoadBalancerAvailableCondition) != clusterv1.DeletingV1Beta1Reason {
147146
v1beta1conditions.MarkFalse(dockerCluster, infrav1.LoadBalancerAvailableV1Beta1Condition, clusterv1.DeletingV1Beta1Reason, clusterv1.ConditionSeverityInfo, "")
148147
conditions.Set(dockerCluster, metav1.Condition{
149148
Type: infrav1.DevClusterDockerLoadBalancerAvailableCondition,

‎test/infrastructure/docker/internal/controllers/backends/docker/dockermachine_backend.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,8 @@ func (r *MachineBackendReconciler) ReconcileNormal(ctx context.Context, cluster
228228
}
229229

230230
// Update the ContainerProvisioned and BootstrapExecSucceeded condition if not already in the correct state.
231-
// TODO (v1beta2): test for v1beta2 conditions
232231
requeue := false
233-
if !v1beta1conditions.IsTrue(dockerMachine, infrav1.ContainerProvisionedV1Beta1Condition) {
232+
if !conditions.IsTrue(dockerMachine, infrav1.DevMachineDockerContainerProvisionedCondition) {
234233
v1beta1conditions.MarkTrue(dockerMachine, infrav1.ContainerProvisionedV1Beta1Condition)
235234
conditions.Set(dockerMachine, metav1.Condition{
236235
Type: infrav1.DevMachineDockerContainerProvisionedCondition,
@@ -425,8 +424,7 @@ func (r *MachineBackendReconciler) ReconcileDelete(ctx context.Context, cluster
425424
// this visible to the users.
426425
// NB. The operation in docker is fast, so there is the chance the user will not notice the status change;
427426
// nevertheless we are issuing a patch so we can test a pattern that will be used by other providers as well
428-
// TODO (v1beta2): test for v1beta2 conditions
429-
if v1beta1conditions.GetReason(dockerMachine, infrav1.ContainerProvisionedV1Beta1Condition) != clusterv1.DeletingV1Beta1Reason {
427+
if conditions.GetReason(dockerMachine, infrav1.DevMachineDockerContainerProvisionedCondition) != clusterv1.DeletingV1Beta1Reason {
430428
v1beta1conditions.MarkFalse(dockerMachine, infrav1.ContainerProvisionedV1Beta1Condition, clusterv1.DeletingV1Beta1Reason, clusterv1.ConditionSeverityInfo, "")
431429
conditions.Set(dockerCluster, metav1.Condition{
432430
Type: infrav1.DevMachineDockerContainerProvisionedCondition,

‎test/infrastructure/docker/internal/controllers/backends/inmemory/inmemorymachine_backend.go‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,7 @@ func (r *MachineBackendReconciler) reconcileNormalCloudMachine(ctx context.Conte
242242

243243
func (r *MachineBackendReconciler) reconcileNormalNode(ctx context.Context, cluster *clusterv1.Cluster, machine *clusterv1.Machine, inMemoryMachine *infrav1.DevMachine) (_ ctrl.Result, retErr error) {
244244
// No-op if the VM is not provisioned yet
245-
// TODO (v1beta2): test for v1beta2 conditions
246-
if !v1beta1conditions.IsTrue(inMemoryMachine, infrav1.VMProvisionedCondition) {
245+
if !conditions.IsTrue(inMemoryMachine, infrav1.DevMachineInMemoryVMProvisionedCondition) {
247246
conditions.Set(inMemoryMachine, metav1.Condition{
248247
Type: infrav1.DevMachineInMemoryNodeProvisionedCondition,
249248
Status: metav1.ConditionFalse,
@@ -280,8 +279,7 @@ func (r *MachineBackendReconciler) reconcileNormalNode(ctx context.Context, clus
280279
}
281280
}
282281

283-
// TODO (v1beta2): test for v1beta2 conditions
284-
start := v1beta1conditions.Get(inMemoryMachine, infrav1.VMProvisionedCondition).LastTransitionTime
282+
start := conditions.Get(inMemoryMachine, infrav1.DevMachineInMemoryVMProvisionedCondition).LastTransitionTime
285283
now := time.Now()
286284
if now.Before(start.Add(provisioningDuration)) {
287285
v1beta1conditions.MarkFalse(inMemoryMachine, infrav1.NodeProvisionedCondition, infrav1.NodeWaitingForStartupTimeoutReason, clusterv1.ConditionSeverityInfo, "")
@@ -374,8 +372,7 @@ func (r *MachineBackendReconciler) reconcileNormalETCD(ctx context.Context, clus
374372
}
375373

376374
// No-op if the VM is not provisioned yet
377-
// TODO (v1beta2): test for v1beta2 conditions
378-
if !v1beta1conditions.IsTrue(inMemoryMachine, infrav1.VMProvisionedCondition) {
375+
if !conditions.IsTrue(inMemoryMachine, infrav1.DevMachineInMemoryVMProvisionedCondition) {
379376
conditions.Set(inMemoryMachine, metav1.Condition{
380377
Type: infrav1.DevMachineInMemoryEtcdProvisionedCondition,
381378
Status: metav1.ConditionFalse,
@@ -385,8 +382,7 @@ func (r *MachineBackendReconciler) reconcileNormalETCD(ctx context.Context, clus
385382
}
386383

387384
// No-op if the Node is not provisioned yet
388-
// TODO (v1beta2): test for v1beta2 conditions
389-
if !v1beta1conditions.IsTrue(inMemoryMachine, infrav1.NodeProvisionedCondition) {
385+
if !conditions.IsTrue(inMemoryMachine, infrav1.DevMachineInMemoryNodeProvisionedCondition) {
390386
conditions.Set(inMemoryMachine, metav1.Condition{
391387
Type: infrav1.DevMachineInMemoryEtcdProvisionedCondition,
392388
Status: metav1.ConditionFalse,
@@ -423,8 +419,7 @@ func (r *MachineBackendReconciler) reconcileNormalETCD(ctx context.Context, clus
423419
}
424420
}
425421

426-
// TODO (v1beta2): test for v1beta2 conditions
427-
start := v1beta1conditions.Get(inMemoryMachine, infrav1.NodeProvisionedCondition).LastTransitionTime
422+
start := conditions.Get(inMemoryMachine, infrav1.DevMachineInMemoryNodeProvisionedCondition).LastTransitionTime
428423
now := time.Now()
429424
if now.Before(start.Add(provisioningDuration)) {
430425
v1beta1conditions.MarkFalse(inMemoryMachine, infrav1.EtcdProvisionedCondition, infrav1.EtcdWaitingForStartupTimeoutReason, clusterv1.ConditionSeverityInfo, "")
@@ -618,8 +613,7 @@ func (r *MachineBackendReconciler) reconcileNormalAPIServer(ctx context.Context,
618613
}
619614

620615
// No-op if the VM is not provisioned yet
621-
// TODO (v1beta2): test for v1beta2 conditions
622-
if !v1beta1conditions.IsTrue(inMemoryMachine, infrav1.VMProvisionedCondition) {
616+
if !conditions.IsTrue(inMemoryMachine, infrav1.DevMachineInMemoryVMProvisionedCondition) {
623617
conditions.Set(inMemoryMachine, metav1.Condition{
624618
Type: infrav1.DevMachineInMemoryAPIServerProvisionedCondition,
625619
Status: metav1.ConditionFalse,
@@ -629,8 +623,7 @@ func (r *MachineBackendReconciler) reconcileNormalAPIServer(ctx context.Context,
629623
}
630624

631625
// No-op if the Node is not provisioned yet
632-
// TODO (v1beta2): test for v1beta2 conditions
633-
if !v1beta1conditions.IsTrue(inMemoryMachine, infrav1.NodeProvisionedCondition) {
626+
if !conditions.IsTrue(inMemoryMachine, infrav1.DevMachineInMemoryNodeProvisionedCondition) {
634627
conditions.Set(inMemoryMachine, metav1.Condition{
635628
Type: infrav1.DevMachineInMemoryAPIServerProvisionedCondition,
636629
Status: metav1.ConditionFalse,
@@ -667,8 +660,7 @@ func (r *MachineBackendReconciler) reconcileNormalAPIServer(ctx context.Context,
667660
}
668661
}
669662

670-
// TODO (v1beta2): test for v1beta2 conditions
671-
start := v1beta1conditions.Get(inMemoryMachine, infrav1.NodeProvisionedCondition).LastTransitionTime
663+
start := conditions.Get(inMemoryMachine, infrav1.DevMachineInMemoryNodeProvisionedCondition).LastTransitionTime
672664
now := time.Now()
673665
if now.Before(start.Add(provisioningDuration)) {
674666
v1beta1conditions.MarkFalse(inMemoryMachine, infrav1.APIServerProvisionedCondition, infrav1.APIServerWaitingForStartupTimeoutReason, clusterv1.ConditionSeverityInfo, "")
@@ -775,8 +767,7 @@ func (r *MachineBackendReconciler) reconcileNormalScheduler(ctx context.Context,
775767
// specific behaviour for this component because they are not relevant for stress tests.
776768
// As a current approximation, we create the scheduler as soon as the API server is provisioned;
777769
// also, the scheduler is immediately marked as ready.
778-
// TODO (v1beta2): test for v1beta2 conditions
779-
if !v1beta1conditions.IsTrue(inMemoryMachine, infrav1.APIServerProvisionedCondition) {
770+
if !conditions.IsTrue(inMemoryMachine, infrav1.DevMachineInMemoryAPIServerProvisionedCondition) {
780771
return ctrl.Result{}, nil
781772
}
782773

@@ -823,8 +814,7 @@ func (r *MachineBackendReconciler) reconcileNormalControllerManager(ctx context.
823814
// specific behaviour for this component because they are not relevant for stress tests.
824815
// As a current approximation, we create the controller manager as soon as the API server is provisioned;
825816
// also, the controller manager is immediately marked as ready.
826-
// TODO (v1beta2): test for v1beta2 conditions
827-
if !v1beta1conditions.IsTrue(inMemoryMachine, infrav1.APIServerProvisionedCondition) {
817+
if !conditions.IsTrue(inMemoryMachine, infrav1.DevMachineInMemoryAPIServerProvisionedCondition) {
828818
return ctrl.Result{}, nil
829819
}
830820

0 commit comments

Comments
 (0)