Rename variables and struct to satisfy kube-1.16.0

Author: enxebre

pkg/controller/disruption/disruption.go

@@ -394,7 +394,7 @@ func (r *ReconcileMachineDisruption) getMachinesForMachineDisruptionBudget(mdb *
 		Namespace:     mdb.Namespace,
 		LabelSelector: sel,
 	}
-	err = r.client.List(context.TODO(), machines, client.UseListOptions(listOptions))
+	err = r.client.List(context.TODO(), machines, listOptions)
 	if err != nil {
 		return nil, err
 	}

pkg/controller/machinehealthcheck/machinehealthcheck_controller.go

@@ -201,11 +201,12 @@ func (r *ReconcileMachineHealthCheck) getNodeNamesForMHC(mhc healthcheckingv1alp
 	}
 	options := client.ListOptions{
 		LabelSelector: selector,
+		Namespace:     mhc.GetNamespace(),
 	}
 
 	if err := r.client.List(context.Background(),
 		machineList,
-		client.UseListOptions(options.InNamespace(mhc.GetNamespace()))); err != nil {
+		&options); err != nil {
 		return nil, fmt.Errorf("failed to list machines: %v", err)
 	}
 

pkg/controller/machinehealthcheck/machinehealthcheck_controller_test.go

@@ -103,7 +103,7 @@ func TestGetNodeCondition(t *testing.T) {
 		{
 			node: maotesting.NewNode("doesNotHaveCondition", true),
 			condition: &corev1.NodeCondition{
-				Type:   corev1.NodeOutOfDisk,
+				Type:   corev1.NodeDiskPressure,
 				Status: corev1.ConditionTrue,
 			},
 			expected: nil,