mirror of
https://github.com/rancher/rke.git
synced 2025-07-31 22:56:19 +00:00
Merge pull request #2124 from mrajashree/drainPanic
Check drainInput for nil to avoid panic
This commit is contained in:
commit
c25b256334
@ -49,10 +49,14 @@ func cordonAndDrainNode(kubeClient *kubernetes.Clientset, host *hosts.Host, drai
|
||||
}
|
||||
|
||||
func getDrainHelper(kubeClient *kubernetes.Clientset, upgradeStrategy v3.NodeUpgradeStrategy) drain.Helper {
|
||||
var ignoreDaemonSets bool
|
||||
if upgradeStrategy.DrainInput == nil || *upgradeStrategy.DrainInput.IgnoreDaemonSets {
|
||||
ignoreDaemonSets = true
|
||||
}
|
||||
drainHelper := drain.Helper{
|
||||
Client: kubeClient,
|
||||
Force: upgradeStrategy.DrainInput.Force,
|
||||
IgnoreAllDaemonSets: *upgradeStrategy.DrainInput.IgnoreDaemonSets,
|
||||
IgnoreAllDaemonSets: ignoreDaemonSets,
|
||||
DeleteLocalData: upgradeStrategy.DrainInput.DeleteLocalData,
|
||||
GracePeriodSeconds: upgradeStrategy.DrainInput.GracePeriod,
|
||||
Timeout: time.Second * time.Duration(upgradeStrategy.DrainInput.Timeout),
|
||||
|
Loading…
Reference in New Issue
Block a user