From bdcf5859d7b92b8257ed81e114af81a24917343e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= Date: Mon, 18 Jun 2018 21:49:35 +0300 Subject: [PATCH] kubeadm: Fix a small config upgrading issue with .CloudProvider --- cmd/kubeadm/app/apis/kubeadm/v1alpha1/conversion.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/conversion.go b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/conversion.go index 1c8820d532e..3bbad16e79d 100644 --- a/cmd/kubeadm/app/apis/kubeadm/v1alpha1/conversion.go +++ b/cmd/kubeadm/app/apis/kubeadm/v1alpha1/conversion.go @@ -113,6 +113,9 @@ func UpgradeCloudProvider(in *MasterConfiguration, out *kubeadm.MasterConfigurat if out.ControllerManagerExtraArgs == nil { out.ControllerManagerExtraArgs = map[string]string{} } + if out.NodeRegistration.KubeletExtraArgs == nil { + out.NodeRegistration.KubeletExtraArgs = map[string]string{} + } out.APIServerExtraArgs["cloud-provider"] = in.CloudProvider out.ControllerManagerExtraArgs["cloud-provider"] = in.CloudProvider