rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-16 05:53:00 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3511 from jiaqiluo/fix-node-drain

Browse Source
This commit is contained in:
Jiaqi Luo 2024-03-01 15:04:30 -07:00 committed by GitHub
commit 9a498c6fe5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/cluster.go
View File

@ -687,10 +687,15 @@ func parseNodeDrainInput(clusterFile string, rkeConfig *v3.RancherKubernetesEngi
nodeDrainInput.GracePeriod = DefaultNodeDrainGracePeriod nodeDrainInput.GracePeriod = DefaultNodeDrainGracePeriod
update = true update = true
} else { } else {
// TODO: ghodssyaml.Marshal is losing the user provided value for GracePeriod, investigate why, till then assign the provided value explicitly // add back user's value because ghodssyaml.Marshal drops the value due to the same field has different names in YAML tag and JSON tag
nodeDrainInput.GracePeriod = int(providedGracePeriod) nodeDrainInput.GracePeriod = int(providedGracePeriod)
} }
// add back user's value because ghodssyaml.Marshal drops the value due to the same field has different names in YAML tag and JSON tag
if val, ok := nodeDrainInputMap["delete_local_data"].(bool); ok {
nodeDrainInput.DeleteLocalData = val
}
if update { if update {
rkeConfig.UpgradeStrategy.DrainInput = &nodeDrainInput rkeConfig.UpgradeStrategy.DrainInput = &nodeDrainInput
} }