Fix kubernetes version for node startup script

kubernetes-sigs · Mar 28, 2019 · 67e8c9c · 67e8c9c
1 parent b55f066
commit 67e8c9c
Show file tree

Hide file tree

Showing 7 changed files with 229 additions and 2 deletions.
diff --git a/.idea/cluster-api-provider-azure.iml b/.idea/cluster-api-provider-azure.iml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/pkg/cloud/azure/services/config/startupscript.go b/pkg/cloud/azure/services/config/startupscript.go
@@ -19,6 +19,7 @@ package config
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/pkg/errors"
 	"k8s.io/klog"
@@ -72,7 +73,7 @@ func GetVMStartupScript(machine *actuators.MachineScope, bootstrapToken string)
 				SaKey:               string(machine.Scope.ClusterConfig.SAKeyPair.Key),
 				BootstrapToken:      bootstrapToken,
 				LBAddress:           dnsName,
-				KubernetesVersion:   machine.Machine.Spec.Versions.ControlPlane,
+				KubernetesVersion:   strings.TrimPrefix(machine.Machine.Spec.Versions.ControlPlane, "v"),
 				CloudProviderConfig: getAzureCloudProviderConfig(machine),
 			})
 			if err != nil {
@@ -99,7 +100,7 @@ func GetVMStartupScript(machine *actuators.MachineScope, bootstrapToken string)
 				PodSubnet:           machine.Scope.Cluster.Spec.ClusterNetwork.Pods.CIDRBlocks[0],
 				ServiceSubnet:       machine.Scope.Cluster.Spec.ClusterNetwork.Services.CIDRBlocks[0],
 				ServiceDomain:       machine.Scope.Cluster.Spec.ClusterNetwork.ServiceDomain,
-				KubernetesVersion:   machine.Machine.Spec.Versions.ControlPlane,
+				KubernetesVersion:   strings.TrimPrefix(machine.Machine.Spec.Versions.Kubelet, "v"),
 				CloudProviderConfig: getAzureCloudProviderConfig(machine),
 			})