feat: drain add fallback to remove pods with grace period 0 #43
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aldor007
force-pushed
the
feat/grace-period-0
branch
from
dd070f8 to
b0327ba
Compare
aldor007
commented
Sep 28, 2022
| @@ -14,11 +14,11 @@ require ( | |||
| go.uber.org/goleak v1.1.12 | |||
| golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f | |||
| helm.sh/helm/v3 v3.9.2 | |||
| k8s.io/api v0.24.2 | |||
| k8s.io/apimachinery v0.24.2 | |||
| k8s.io/api v0.25.2 | |||
There was a problem hiding this comment.
Contains fix for testing lib kubernetes/kubernetes#110425
| @@ -54,7 +54,7 @@ func (h *drainNodeHandler) Handle(ctx context.Context, data interface{}) error { | |||
| return fmt.Errorf("unexpected type %T for delete drain handler", data) | |||
| } | |||
|
|
|||
| log := h.log.WithField("node_name", req.NodeName) | |||
There was a problem hiding this comment.
This is a drain handler, please consider removing 'delete' from the logging message above.
actions/drain_node_handler.go
Outdated
| return fmt.Errorf("sending evict pods requests: %w", err) | ||
| } | ||
|
|
||
| return h.waitNodePodsTerminated(ctx, node) | ||
| } | ||
|
|
||
| func (h *drainNodeHandler) deleteNodePods(ctx context.Context, log logrus.FieldLogger, node *v1.Node) error { | ||
| func (h *drainNodeHandler) deleteNodePods(ctx context.Context, log logrus.FieldLogger, options metav1.DeleteOptions, node *v1.Node) error { |
There was a problem hiding this comment.
It is a common practice to have options as the last parameter in a signature.
actions/drain_node_handler.go
Outdated
| return fmt.Errorf("sending evict pods requests: %w", err) | ||
| } | ||
|
|
||
| return h.waitNodePodsTerminated(ctx, node) | ||
| } | ||
|
|
||
| func (h *drainNodeHandler) deleteNodePods(ctx context.Context, log logrus.FieldLogger, node *v1.Node) error { | ||
| func (h *drainNodeHandler) deleteNodePods(ctx context.Context, log logrus.FieldLogger, options metav1.DeleteOptions, node *v1.Node) error { |
There was a problem hiding this comment.
I wonder have you considered using functional options pattern? https://golang.cafe/blog/golang-functional-options-pattern.html
aldor007
force-pushed
the
feat/grace-period-0
branch
from
fb81f4d to
b37ea68
Compare
actions/drain_node_handler.go
Outdated
| @@ -195,7 +210,7 @@ func (h *drainNodeHandler) waitNodePodsTerminated(ctx context.Context, node *v1. | |||
|
|
|||
| // evictPod from the k8s node. Error handling is based on eviction api documentation: | |||
| // https://kubernetes.io/docs/tasks/administer-cluster/safely-drain-node/#the-eviction-api | |||
| func (h *drainNodeHandler) evictPod(ctx context.Context, pod v1.Pod) error { | |||
| func (h *drainNodeHandler) evictPod(ctx context.Context, options metav1.DeleteOptions, pod v1.Pod) error { | |||
There was a problem hiding this comment.
evict doesn't need DeleteOptions so I would suggest keeping method signature as it was
and while deleting pods do:
sendPodsRequests doesn't need it too
fn := func(ctx context.Context, pod v1.Pod) error {
return h.deletePod(ctx, options, pod)
}
if err := h.sendPodsRequests(ctx, pods, fn); err != nil {
return fmt.Errorf("sending delete pods requests: %w", err)
}
actions/drain_node_handler.go
Outdated
Comment on lines
87
to
102
| deleteCtx, deleteCancel := context.WithTimeout(ctx, h.cfg.podsDeleteTimeout) | ||
| defer deleteCancel() | ||
| if err := h.deleteNodePods(deleteCtx, log, node); err != nil { | ||
| err = h.deleteNodePods(deleteCtx, log, node, metav1.DeleteOptions{}) | ||
| if err == nil { | ||
| log.Info("node drained") | ||
| return nil | ||
| } | ||
| if !errors.Is(err, context.DeadlineExceeded) { | ||
| return fmt.Errorf("forcefully deleting pods: %w", err) | ||
| } | ||
|
|
||
| deleteForceCtx, deleteForceCancel := context.WithTimeout(ctx, h.cfg.podsDeleteTimeout) | ||
| defer deleteForceCancel() | ||
| if err = h.deleteNodePods(deleteForceCtx, log, node, *metav1.NewDeleteOptions(0)); err != nil { | ||
| return fmt.Errorf("deleting gracePeriod=0 pods: %w", err) | ||
| } |
There was a problem hiding this comment.
suggestion, maybe this will be more clear: 🤔
// Try deleteing pods gracefully first, then delete with 0 grace period.
options := []metav1.DeleteOptions{
metav1.DeleteOptions{},
*metav1.NewDeleteOptions(0)
}
var err error
for _, o := options {
deleteCtx, deleteCancel := context.WithTimeout(ctx, h.cfg.podsDeleteTimeout)
defer deleteCancel()
err = h.deleteNodePods(deleteCtx, log, node, o);
if err == nil {
return nil
}
if !errors.Is(err, context.DeadlineExceeded) {
return fmt.Errorf("forcefully deleting pods: %w", err)
}
}
return err
varnastadeus
approved these changes
Sep 30, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.