rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-01 23:33:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2124 from mrajashree/drainPanic

Browse Source 
Check drainInput for nil to avoid panic
This commit is contained in:
Rajashree Mandaogane 2020-06-16 17:07:41 -07:00 committed by GitHub
commit c25b256334
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/node_util.go
View File

@ -49,10 +49,14 @@ func cordonAndDrainNode(kubeClient *kubernetes.Clientset, host *hosts.Host, drai
} }
func getDrainHelper(kubeClient *kubernetes.Clientset, upgradeStrategy v3.NodeUpgradeStrategy) drain.Helper { 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{ drainHelper := drain.Helper{
Client: kubeClient, Client: kubeClient,
Force: upgradeStrategy.DrainInput.Force, Force: upgradeStrategy.DrainInput.Force,
IgnoreAllDaemonSets: *upgradeStrategy.DrainInput.IgnoreDaemonSets, IgnoreAllDaemonSets: ignoreDaemonSets,
DeleteLocalData: upgradeStrategy.DrainInput.DeleteLocalData, DeleteLocalData: upgradeStrategy.DrainInput.DeleteLocalData,
GracePeriodSeconds: upgradeStrategy.DrainInput.GracePeriod, GracePeriodSeconds: upgradeStrategy.DrainInput.GracePeriod,
Timeout: time.Second * time.Duration(upgradeStrategy.DrainInput.Timeout), Timeout: time.Second * time.Duration(upgradeStrategy.DrainInput.Timeout),