Fix deprecation lint errors and don't deprecate ready

willie-yao · willie-yao · commit f5111c0a15bd · 2026-04-02T13:50:19.000-07:00
Signed-off-by: William Yao &lt;william2000yao@gmail.com&gt;
diff --git a/api/v1beta1/azureasomanagedcluster_types.go b/api/v1beta1/azureasomanagedcluster_types.go
@@ -45,7 +45,6 @@ type AzureASOManagedClusterSpec struct {
 type AzureASOManagedClusterStatus struct {
 	// Ready represents whether or not the cluster has been provisioned and is ready. It fulfills Cluster
 	// API's cluster infrastructure provider contract.
-	// Deprecated: Use status.initialization.provisioned instead.
 	//+optional
 	Ready bool `json:"ready"`
 
diff --git a/api/v1beta1/azureasomanagedcontrolplane_types.go b/api/v1beta1/azureasomanagedcontrolplane_types.go
@@ -33,13 +33,11 @@ type AzureASOManagedControlPlaneSpec struct {
 type AzureASOManagedControlPlaneStatus struct {
 	// Initialized represents whether or not the API server has been provisioned. It fulfills Cluster API's
 	// control plane provider contract. For AKS, this is equivalent to `ready`.
-	// Deprecated: Use status.initialization.controlPlaneInitialized instead.
 	//+optional
 	Initialized bool `json:"initialized"`
 
 	// Ready represents whether or not the API server is ready to receive requests. It fulfills Cluster API's
 	// control plane provider contract. For AKS, this is equivalent to `initialized`.
-	// Deprecated: Use status.initialization.controlPlaneInitialized instead.
 	//+optional
 	Ready bool `json:"ready"`
 
diff --git a/api/v1beta1/azureasomanagedmachinepool_types.go b/api/v1beta1/azureasomanagedmachinepool_types.go
@@ -42,7 +42,6 @@ type AzureASOManagedMachinePoolStatus struct {
 
 	// Ready represents whether or not the infrastructure is ready to be used. It fulfills Cluster API's
 	// machine pool infrastructure provider contract.
-	// Deprecated: Use status.initialization.provisioned instead.
 	//+optional
 	Ready bool `json:"ready"`
 
diff --git a/api/v1beta1/azurecluster_types.go b/api/v1beta1/azurecluster_types.go
@@ -68,7 +68,6 @@ type AzureClusterStatus struct {
 	FailureDomains clusterv1beta1.FailureDomains `json:"failureDomains,omitempty"`
 
 	// Ready is true when the provider resource is ready.
-	// Deprecated: Use status.initialization.provisioned instead.
 	// +optional
 	Ready bool `json:"ready"`
 
diff --git a/api/v1beta1/azuremachine_types.go b/api/v1beta1/azuremachine_types.go
@@ -195,7 +195,6 @@ type SystemAssignedIdentityRole struct {
 // AzureMachineStatus defines the observed state of AzureMachine.
 type AzureMachineStatus struct {
 	// Ready is true when the provider resource is ready.
-	// Deprecated: Use status.initialization.provisioned instead.
 	// +optional
 	Ready bool `json:"ready"`
 
diff --git a/api/v1beta1/azuremanagedcluster_types.go b/api/v1beta1/azuremanagedcluster_types.go
@@ -34,7 +34,6 @@ type AzureManagedClusterSpec struct {
 // AzureManagedClusterStatus defines the observed state of AzureManagedCluster.
 type AzureManagedClusterStatus struct {
 	// Ready is true when the provider resource is ready.
-	// Deprecated: Use status.initialization.provisioned instead.
 	// +optional
 	Ready bool `json:"ready,omitempty"`
 
diff --git a/api/v1beta1/azuremanagedcontrolplane_types.go b/api/v1beta1/azuremanagedcontrolplane_types.go
@@ -413,14 +413,12 @@ type AzureManagedControlPlaneStatus struct {
 	AutoUpgradeVersion string `json:"autoUpgradeVersion,omitempty"`
 
 	// Ready is true when the provider resource is ready.
-	// Deprecated: Use status.initialization.controlPlaneInitialized instead.
 	// +optional
 	Ready bool `json:"ready,omitempty"`
 
 	// Initialized is true when the control plane is available for initial contact.
 	// This may occur before the control plane is fully ready.
 	// In the AzureManagedControlPlane implementation, these are identical.
-	// Deprecated: Use status.initialization.controlPlaneInitialized instead.
 	// +optional
 	Initialized bool `json:"initialized,omitempty"`
 
diff --git a/api/v1beta1/azuremanagedmachinepool_types.go b/api/v1beta1/azuremanagedmachinepool_types.go
@@ -452,7 +452,6 @@ type Taints []Taint
 // AzureManagedMachinePoolStatus defines the observed state of AzureManagedMachinePool.
 type AzureManagedMachinePoolStatus struct {
 	// Ready is true when the provider resource is ready.
-	// Deprecated: Use status.initialization.provisioned instead.
 	// +optional
 	Ready bool `json:"ready"`
 
diff --git a/azure/scope/machine.go b/azure/scope/machine.go
@@ -602,12 +602,12 @@ func (m *MachineScope) SetNotReady() {
 
 // SetFailureMessage sets the AzureMachine status failure message.
 func (m *MachineScope) SetFailureMessage(v error) {
-	m.AzureMachine.Status.FailureMessage = ptr.To(v.Error())
+	m.AzureMachine.Status.FailureMessage = ptr.To(v.Error()) //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
 }
 
 // SetFailureReason sets the AzureMachine status failure reason.
 func (m *MachineScope) SetFailureReason(v string) {
-	m.AzureMachine.Status.FailureReason = &v
+	m.AzureMachine.Status.FailureReason = &v //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
 }
 
 // SetConditionFalse sets the specified AzureMachine condition to false.
diff --git a/azure/scope/machinepool.go b/azure/scope/machinepool.go
@@ -639,12 +639,12 @@ func (m *MachinePoolScope) SetNotReady() {
 
 // SetFailureMessage sets the AzureMachinePool status failure message.
 func (m *MachinePoolScope) SetFailureMessage(v error) {
-	m.AzureMachinePool.Status.FailureMessage = ptr.To(v.Error())
+	m.AzureMachinePool.Status.FailureMessage = ptr.To(v.Error()) //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
 }
 
 // SetFailureReason sets the AzureMachinePool status failure reason.
 func (m *MachinePoolScope) SetFailureReason(v string) {
-	m.AzureMachinePool.Status.FailureReason = &v
+	m.AzureMachinePool.Status.FailureReason = &v //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
 }
 
 // AdditionalTags merges AdditionalTags from the scope's AzureCluster and AzureMachinePool. If the same key is present in both,
diff --git a/azure/scope/machinepoolmachine.go b/azure/scope/machinepoolmachine.go
@@ -272,12 +272,12 @@ func (s *MachinePoolMachineScope) IsReady() bool {
 
 // SetFailureMessage sets the AzureMachinePoolMachine status failure message.
 func (s *MachinePoolMachineScope) SetFailureMessage(v error) {
-	s.AzureMachinePoolMachine.Status.FailureMessage = ptr.To(v.Error())
+	s.AzureMachinePoolMachine.Status.FailureMessage = ptr.To(v.Error()) //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
 }
 
 // SetFailureReason sets the AzureMachinePoolMachine status failure reason.
 func (s *MachinePoolMachineScope) SetFailureReason(v string) {
-	s.AzureMachinePoolMachine.Status.FailureReason = &v
+	s.AzureMachinePoolMachine.Status.FailureReason = &v //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
 }
 
 // ProviderID returns the AzureMachinePool ID by parsing Spec.FakeProviderID.
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azureasomanagedclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azureasomanagedclusters.yaml
@@ -180,7 +180,6 @@ spec:
                 description: |-
                   Ready represents whether or not the cluster has been provisioned and is ready. It fulfills Cluster
                   API's cluster infrastructure provider contract.
-                  Deprecated: Use status.initialization.provisioned instead.
                 type: boolean
               resources:
                 items:
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azureasomanagedcontrolplanes.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azureasomanagedcontrolplanes.yaml
@@ -196,13 +196,11 @@ spec:
                 description: |-
                   Initialized represents whether or not the API server has been provisioned. It fulfills Cluster API's
                   control plane provider contract. For AKS, this is equivalent to `ready`.
-                  Deprecated: Use status.initialization.controlPlaneInitialized instead.
                 type: boolean
               ready:
                 description: |-
                   Ready represents whether or not the API server is ready to receive requests. It fulfills Cluster API's
                   control plane provider contract. For AKS, this is equivalent to `initialized`.
-                  Deprecated: Use status.initialization.controlPlaneInitialized instead.
                 type: boolean
               resources:
                 items:
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azureasomanagedmachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azureasomanagedmachinepools.yaml
@@ -170,7 +170,6 @@ spec:
                 description: |-
                   Ready represents whether or not the infrastructure is ready to be used. It fulfills Cluster API's
                   machine pool infrastructure provider contract.
-                  Deprecated: Use status.initialization.provisioned instead.
                 type: boolean
               replicas:
                 description: |-
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azureclusters.yaml
@@ -1501,9 +1501,7 @@ spec:
                   type: object
                 type: array
               ready:
-                description: |-
-                  Ready is true when the provider resource is ready.
-                  Deprecated: Use status.initialization.provisioned instead.
+                description: Ready is true when the provider resource is ready.
                 type: boolean
               v1beta2:
                 description: v1beta2 groups all the fields that will be added or modified
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinepoolmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinepoolmachines.yaml
@@ -271,9 +271,7 @@ spec:
                   virtual machine instance.
                 type: string
               ready:
-                description: |-
-                  Ready is true when the provider resource is ready.
-                  Deprecated: Use status.initialization.provisioned instead.
+                description: Ready is true when the provider resource is ready.
                 type: boolean
               v1beta2:
                 description: v1beta2 groups all the fields that will be added or modified
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachinepools.yaml
@@ -1172,9 +1172,7 @@ spec:
                   virtual machine.
                 type: string
               ready:
-                description: |-
-                  Ready is true when the provider resource is ready.
-                  Deprecated: Use status.initialization.provisioned instead.
+                description: Ready is true when the provider resource is ready.
                 type: boolean
               replicas:
                 description: Replicas is the most recently observed number of replicas.
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremachines.yaml
@@ -870,9 +870,7 @@ spec:
                   type: object
                 type: array
               ready:
-                description: |-
-                  Ready is true when the provider resource is ready.
-                  Deprecated: Use status.initialization.provisioned instead.
+                description: Ready is true when the provider resource is ready.
                 type: boolean
               v1beta2:
                 description: v1beta2 groups all the fields that will be added or modified
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremanagedclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremanagedclusters.yaml
@@ -92,9 +92,7 @@ spec:
                     type: boolean
                 type: object
               ready:
-                description: |-
-                  Ready is true when the provider resource is ready.
-                  Deprecated: Use status.initialization.provisioned instead.
+                description: Ready is true when the provider resource is ready.
                 type: boolean
             type: object
         type: object
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremanagedcontrolplanes.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremanagedcontrolplanes.yaml
@@ -988,7 +988,6 @@ spec:
                   Initialized is true when the control plane is available for initial contact.
                   This may occur before the control plane is fully ready.
                   In the AzureManagedControlPlane implementation, these are identical.
-                  Deprecated: Use status.initialization.controlPlaneInitialized instead.
                 type: boolean
               longRunningOperationStates:
                 description: |-
@@ -1036,9 +1035,7 @@ spec:
                     type: string
                 type: object
               ready:
-                description: |-
-                  Ready is true when the provider resource is ready.
-                  Deprecated: Use status.initialization.controlPlaneInitialized instead.
+                description: Ready is true when the provider resource is ready.
                 type: boolean
               v1beta2:
                 description: v1beta2 groups all the fields that will be added or modified
diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremanagedmachinepools.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_azuremanagedmachinepools.yaml
@@ -751,9 +751,7 @@ spec:
                   type: object
                 type: array
               ready:
-                description: |-
-                  Ready is true when the provider resource is ready.
-                  Deprecated: Use status.initialization.provisioned instead.
+                description: Ready is true when the provider resource is ready.
                 type: boolean
               replicas:
                 description: Replicas is the most recently observed number of replicas.
diff --git a/controllers/azuremachine_controller.go b/controllers/azuremachine_controller.go
@@ -241,7 +241,7 @@ func (amr *AzureMachineReconciler) reconcileNormal(ctx context.Context, machineS
 
 	log.Info("Reconciling AzureMachine")
 	// If the AzureMachine is in an error state, return early.
-	if machineScope.AzureMachine.Status.FailureReason != nil || machineScope.AzureMachine.Status.FailureMessage != nil {
+	if machineScope.AzureMachine.Status.FailureReason != nil || machineScope.AzureMachine.Status.FailureMessage != nil { //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
 		log.Info("Error state detected, skipping reconciliation")
 		return reconcile.Result{}, nil
 	}
diff --git a/controllers/azuremachine_controller_test.go b/controllers/azuremachine_controller_test.go
@@ -185,7 +185,7 @@ func TestAzureMachineReconcileNormal(t *testing.T) {
 		},
 		"should skip reconciliation if error state is detected on azure machine": {
 			azureMachineOptions: func(am *infrav1.AzureMachine) {
-				am.Status.FailureReason = ptr.To(azure.UpdateError)
+				am.Status.FailureReason = ptr.To(azure.UpdateError) //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
 			},
 			createAzureMachineService: getFakeAzureMachineService,
 		},
@@ -254,8 +254,8 @@ func TestAzureMachineReconcileNormal(t *testing.T) {
 				g.Expect(machineScope.AzureMachine.Status.Ready).To(BeTrue())
 			}
 			if tc.machineScopeFailureReason != "" {
-				g.Expect(machineScope.AzureMachine.Status.FailureReason).NotTo(BeNil())
-				g.Expect(*machineScope.AzureMachine.Status.FailureReason).To(Equal(tc.machineScopeFailureReason))
+				g.Expect(machineScope.AzureMachine.Status.FailureReason).NotTo(BeNil())                           //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
+				g.Expect(*machineScope.AzureMachine.Status.FailureReason).To(Equal(tc.machineScopeFailureReason)) //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
 			}
 			if tc.expectedErr != "" {
 				g.Expect(err).To(HaveOccurred())
diff --git a/exp/api/v1beta1/azuremachinepool_types.go b/exp/api/v1beta1/azuremachinepool_types.go
@@ -244,7 +244,6 @@ type (
 	// AzureMachinePoolStatus defines the observed state of AzureMachinePool.
 	AzureMachinePoolStatus struct {
 		// Ready is true when the provider resource is ready.
-		// Deprecated: Use status.initialization.provisioned instead.
 		// +optional
 		Ready bool `json:"ready"`
 
diff --git a/exp/api/v1beta1/azuremachinepoolmachine_types.go b/exp/api/v1beta1/azuremachinepoolmachine_types.go
@@ -104,7 +104,6 @@ type (
 		LatestModelApplied bool `json:"latestModelApplied,omitempty"`
 
 		// Ready is true when the provider resource is ready.
-		// Deprecated: Use status.initialization.provisioned instead.
 		// +optional
 		Ready bool `json:"ready"`
 
diff --git a/exp/controllers/azuremachinepool_controller.go b/exp/controllers/azuremachinepool_controller.go
@@ -267,7 +267,7 @@ func (ampr *AzureMachinePoolReconciler) reconcileNormal(ctx context.Context, mac
 	log.Info("Reconciling AzureMachinePool")
 
 	// If the AzureMachine is in an error state, return early.
-	if machinePoolScope.AzureMachinePool.Status.FailureReason != nil || machinePoolScope.AzureMachinePool.Status.FailureMessage != nil {
+	if machinePoolScope.AzureMachinePool.Status.FailureReason != nil || machinePoolScope.AzureMachinePool.Status.FailureMessage != nil { //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
 		log.Info("Error state detected, skipping reconciliation")
 		return reconcile.Result{}, nil
 	}
diff --git a/exp/controllers/azuremachinepoolmachine_controller.go b/exp/controllers/azuremachinepoolmachine_controller.go
@@ -262,7 +262,7 @@ func (ampmr *AzureMachinePoolMachineController) reconcileNormal(ctx context.Cont
 
 	log.Info("Reconciling AzureMachinePoolMachine")
 	// If the AzureMachine is in an error state, return early.
-	if machineScope.AzureMachinePool.Status.FailureReason != nil || machineScope.AzureMachinePool.Status.FailureMessage != nil {
+	if machineScope.AzureMachinePool.Status.FailureReason != nil || machineScope.AzureMachinePool.Status.FailureMessage != nil { //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
 		log.Info("Error state detected, skipping reconciliation")
 		return reconcile.Result{}, nil
 	}
diff --git a/exp/controllers/azuremachinepoolmachine_controller_test.go b/exp/controllers/azuremachinepoolmachine_controller_test.go
@@ -75,8 +75,8 @@ func TestAzureMachinePoolMachineReconciler_Reconcile(t *testing.T) {
 					Namespace: "default",
 				}, ampm)
 				g.Expect(err).NotTo(HaveOccurred())
-				g.Expect(ampm.Status.FailureReason).To(BeNil())
-				g.Expect(ampm.Status.FailureMessage).To(BeNil())
+				g.Expect(ampm.Status.FailureReason).To(BeNil())  //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
+				g.Expect(ampm.Status.FailureMessage).To(BeNil()) //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped
 			},
 		},
 		{

Original file line number	Diff line number	Diff line change
`@@ -602,12 +602,12 @@ func (m *MachineScope) SetNotReady() {`
`602`	`602`
`603`	`603`	`// SetFailureMessage sets the AzureMachine status failure message.`
`604`	`604`	`func (m *MachineScope) SetFailureMessage(v error) {`
`605`		`- m.AzureMachine.Status.FailureMessage = ptr.To(v.Error())`
	`605`	`+ m.AzureMachine.Status.FailureMessage = ptr.To(v.Error()) //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped`
`606`	`606`	`}`
`607`	`607`
`608`	`608`	`// SetFailureReason sets the AzureMachine status failure reason.`
`609`	`609`	`func (m *MachineScope) SetFailureReason(v string) {`
`610`		`- m.AzureMachine.Status.FailureReason = &v`
	`610`	`+ m.AzureMachine.Status.FailureReason = &v //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped`
`611`	`611`	`}`
`612`	`612`
`613`	`613`	`// SetConditionFalse sets the specified AzureMachine condition to false.`
Original file line number	Diff line number	Diff line change
`@@ -639,12 +639,12 @@ func (m *MachinePoolScope) SetNotReady() {`
`639`	`639`
`640`	`640`	`// SetFailureMessage sets the AzureMachinePool status failure message.`
`641`	`641`	`func (m *MachinePoolScope) SetFailureMessage(v error) {`
`642`		`- m.AzureMachinePool.Status.FailureMessage = ptr.To(v.Error())`
	`642`	`+ m.AzureMachinePool.Status.FailureMessage = ptr.To(v.Error()) //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped`
`643`	`643`	`}`
`644`	`644`
`645`	`645`	`// SetFailureReason sets the AzureMachinePool status failure reason.`
`646`	`646`	`func (m *MachinePoolScope) SetFailureReason(v string) {`
`647`		`- m.AzureMachinePool.Status.FailureReason = &v`
	`647`	`+ m.AzureMachinePool.Status.FailureReason = &v //nolint:staticcheck // will be removed when failureReason/failureMessage are dropped`
`648`	`648`	`}`
`649`	`649`
`650`	`650`	`// AdditionalTags merges AdditionalTags from the scope's AzureCluster and AzureMachinePool. If the same key is present in both,`