Skip to content

Commit

Permalink
add comment on skipWaitForDeleteTimeout and update README.md
Browse files Browse the repository at this point in the history
  • Loading branch information
Menna authored and dweomer committed Jun 18, 2020
1 parent 3a4e760 commit fc4809c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,10 @@ spec:
# deleteLocalData: true # default
# ignoreDaemonSets: true # default
force: true
#disableEviction: false #default
#disableEviction: false # default
#disableEviction flag option is only available in kubectl v1.18 or later, to force drain pods with pod disruption budget.
#skipWaitForDeleteTimeout : 0 # default
#skipWaitForDeleteTimeout flag option is only available in kubectl v1.18 or later, If pod DeletionTimestamp older than N seconds, skip waiting for the pod. Seconds must be greater than 0 to skip.
# If `drain` is specified, the value for `cordon` is ignored.
# If neither `drain` nor `cordon` are specified and the node is marked as `schedulable=false` it will not be marked as `schedulable=true` when the apply job completes.
Expand Down
1 change: 1 addition & 0 deletions pkg/upgrade/job/job.go
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ func New(plan *upgradeapiv1.Plan, nodeName, controllerName string) *batchv1.Job
args = append(args, "--disable-eviction=true")
}
if drain.SkipWaitForDeleteTimeout > 0 {
//only available in kubectl version 1.18 or later
args = append(args, "--skip-wait-for-delete-timeout", string(drain.SkipWaitForDeleteTimeout))
}

Expand Down

0 comments on commit fc4809c

Please sign in to comment.