Skip to content

Fix eviction controller evicts volume on VPA eviction #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gerrit91 merged 5 commits into from
Jan 14, 2026
Merged

Fix eviction controller evicts volume on VPA eviction #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ae1c3a
Debug why eviction happens on Gardener.
Gerrit91 Jan 13, 2026
1e959c7
Always check if node is unschedulable.
Gerrit91 Jan 14, 2026
9b2b870
More improvements.
Gerrit91 Jan 14, 2026
f235366
Revert Makefile, now separate PR.
Gerrit91 Jan 14, 2026
f370ed3
Tidy.
Gerrit91 Jan 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion cmd/controller/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ func init() {
// +kubebuilder:scaffold:scheme
}

// nolint:gocyclo
func main() {
var (
provisionerName string
Expand Down
42 changes: 18 additions & 24 deletions pkg/controller/eviction_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,6 @@ func (r *CsiDriverLvmReconciler) Reconcile(ctx context.Context, req ctrl.Request
return ctrl.Result{}, fmt.Errorf("unable to fetch pod %q: %w", req.NamespacedName, err)
}

//on node drain -> pod gets evicted
hasDisruptionTarget := hasDisruptionCondition(pod.Status.Conditions)
//on missed disruptionTarget
isUnscheduled := isUnscheduled(pod.Status.Conditions)

if !hasDisruptionTarget && !isUnscheduled {
return ctrl.Result{}, nil
}

belongs := map[string]bool{}
for _, or := range pod.OwnerReferences {
if or.Kind != "StatefulSet" {
Expand Down Expand Up @@ -153,22 +144,25 @@ func (r *CsiDriverLvmReconciler) Reconcile(ctx context.Context, req ctrl.Request
continue
}

if isUnscheduled {
if pv.Spec.NodeAffinity != nil && pv.Spec.NodeAffinity.Required != nil {
if len(pv.Spec.NodeAffinity.Required.NodeSelectorTerms) != 1 {
return ctrl.Result{}, fmt.Errorf("unexpected node-affinity in pv in csi-driver-lvm managed pv %s", pv.Name)
}
if pv.Spec.NodeAffinity == nil || pv.Spec.NodeAffinity.Required == nil {
// no node affinity on the pv => we do not need to delete anything
continue
}

var node corev1.Node
if err := r.Get(ctx, types.NamespacedName{Name: pv.Spec.NodeAffinity.Required.NodeSelectorTerms[0].MatchExpressions[0].Values[0]}, &node); err != nil {
return ctrl.Result{}, fmt.Errorf("unable to fetch node %q: %w", pod.Spec.NodeName, err)
}
if !node.Spec.Unschedulable {
continue
}
} else {
continue
}
if len(pv.Spec.NodeAffinity.Required.NodeSelectorTerms) != 1 {
return ctrl.Result{}, fmt.Errorf("unexpected node-affinity in pv in csi-driver-lvm managed pv %s", pv.Name)
}

var node corev1.Node
err = r.Get(ctx, types.NamespacedName{Name: pv.Spec.NodeAffinity.Required.NodeSelectorTerms[0].MatchExpressions[0].Values[0]}, &node)
if client.IgnoreNotFound(err) != nil {
return ctrl.Result{}, fmt.Errorf("unable to fetch node %q: %w", pod.Spec.NodeName, err)
}

if err == nil && !node.Spec.Unschedulable {
// as long as the node is present and schedulable, we do not need to delete the pvc
// this can happen for instance on pod eviction through a pod autoscaler
continue
}

r.Log.Info("trying to delete pvc because of eviction",
Expand Down