kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97078 from srm09/add-context-to-cordon-update 

Passes a context to the drain helper object

Kubernetes-commit: 2efd2936584c78d01ee3d2f92ac23eb5529e89bd
This commit is contained in:
Kubernetes Publisher 2021-01-21 12:01:03 -08:00
parent 45e1f3a9b9 72f141c577
commit 952f50e545
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/drain/cordon.go
View File

@ -73,6 +73,12 @@ func (c *CordonHelper) UpdateIfRequired(desired bool) bool {
// JSON, or if either patch or update calls fail; it will also return a second error
// whenever creating a patch has failed
func (c *CordonHelper) PatchOrReplace(clientset kubernetes.Interface, serverDryRun bool) (error, error) {
return c.PatchOrReplaceWithContext(context.TODO(), clientset, serverDryRun)
}
// PatchOrReplaceWithContext provides the option to pass a custom context while updating
// the node status
func (c *CordonHelper) PatchOrReplaceWithContext(clientCtx context.Context, clientset kubernetes.Interface, serverDryRun bool) (error, error) {
client := clientset.CoreV1().Nodes()
oldData, err := json.Marshal(c.node)
@ -93,13 +99,13 @@ func (c *CordonHelper) PatchOrReplace(clientset kubernetes.Interface, serverDryR
if serverDryRun {
patchOptions.DryRun = []string{metav1.DryRunAll}
}
_, err = client.Patch(context.TODO(), c.node.Name, types.StrategicMergePatchType, patchBytes, patchOptions)
_, err = client.Patch(clientCtx, c.node.Name, types.StrategicMergePatchType, patchBytes, patchOptions)
} else {
updateOptions := metav1.UpdateOptions{}
if serverDryRun {
updateOptions.DryRun = []string{metav1.DryRunAll}
}
_, err = client.Update(context.TODO(), c.node, updateOptions)
_, err = client.Update(clientCtx, c.node, updateOptions)
}
return err, patchErr
}

2
pkg/drain/default.go
View File

@ -57,7 +57,7 @@ func RunCordonOrUncordon(drainer *Helper, node *corev1.Node, desired bool) error
return nil
}
err, patchErr := c.PatchOrReplace(drainer.Client, false)
err, patchErr := c.PatchOrReplaceWithContext(drainer.Ctx, drainer.Client, false)
if err != nil {
if patchErr != nil {
return fmt.Errorf("cordon error: %s; merge patch error: %s", err.Error(), patchErr.Error())