diff --git a/internal/controller/node_eviction_label_controller.go b/internal/controller/node_eviction_label_controller.go index e3c6a213..56e5b587 100644 --- a/internal/controller/node_eviction_label_controller.go +++ b/internal/controller/node_eviction_label_controller.go @@ -140,10 +140,6 @@ func (r *NodeEvictionLabelReconciler) reconcileEviction(ctx context.Context, evi Reason: fmt.Sprintf("openstack-hypervisor-operator: label %v=%v", labelEvictionRequired, maintenanceValue), } - if err = enableInstanceHAMissingOkay(node); err != nil { - return "", fmt.Errorf("failed to enable instance ha before eviction due to %w", err) - } - if err = r.Create(ctx, eviction); err != nil { return "", fmt.Errorf("failed to create eviction due to %w", err) } diff --git a/internal/controller/utils.go b/internal/controller/utils.go index 97003cb7..06771fb9 100644 --- a/internal/controller/utils.go +++ b/internal/controller/utils.go @@ -79,10 +79,6 @@ func enableInstanceHA(node *corev1.Node) error { return updateInstanceHA(node, `{"enabled": true}`, []int{http.StatusOK}) } -func enableInstanceHAMissingOkay(node *corev1.Node) error { - return updateInstanceHA(node, `{"enabled": true}`, []int{http.StatusOK, http.StatusNotFound}) -} - func disableInstanceHA(node *corev1.Node) error { return updateInstanceHA(node, `{"enabled": false}`, []int{http.StatusOK, http.StatusNotFound}) }