github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

kubeadm: Fix a small config upgrading issue with .CloudProvider

pull/8/head
Lucas Käldström 2018-06-18 21:49:35 +03:00
parent 6d3f5b75f5
commit bdcf5859d7
No known key found for this signature in database
GPG Key ID: 3FA3783D77751514
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/apis/kubeadm/v1alpha1/conversion.go
View File

@ -113,6 +113,9 @@ func UpgradeCloudProvider(in *MasterConfiguration, out *kubeadm.MasterConfigurat
if out.ControllerManagerExtraArgs == nil { if out.ControllerManagerExtraArgs == nil {
out.ControllerManagerExtraArgs = map[string]string{} out.ControllerManagerExtraArgs = map[string]string{}
} }
if out.NodeRegistration.KubeletExtraArgs == nil {
out.NodeRegistration.KubeletExtraArgs = map[string]string{}
}
out.APIServerExtraArgs["cloud-provider"] = in.CloudProvider out.APIServerExtraArgs["cloud-provider"] = in.CloudProvider
out.ControllerManagerExtraArgs["cloud-provider"] = in.CloudProvider out.ControllerManagerExtraArgs["cloud-provider"] = in.CloudProvider