fix populate classicmode default value function
@@ -804,32 +804,32 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
if !t.ClassicMode {
val = ""
} else {
- kubernetesVersion := cs.Properties.OrchestratorProfile.OrchestratorVersion
+ kubernetesRelease := cs.Properties.OrchestratorProfile.OrchestratorRelease
cloudSpecConfig := GetCloudSpecConfig(cs.Location)
switch attr {
case "kubernetesHyperkubeSpec":
- val = cs.Properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBase + KubeConfigs[kubernetesVersion]["hyperkube"]
+ val = cs.Properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBase + KubeConfigs[kubernetesRelease]["hyperkube"]
if cs.Properties.OrchestratorProfile.KubernetesConfig.CustomHyperkubeImage != "" {
val = cs.Properties.OrchestratorProfile.KubernetesConfig.CustomHyperkubeImage
}
case "kubernetesAddonManagerSpec":
- val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesVersion]["addonmanager"]
+ val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesRelease]["addonmanager"]
case "kubernetesAddonResizerSpec":
- val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesVersion]["addonresizer"]
+ val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesRelease]["addonresizer"]
case "kubernetesDashboardSpec":
- val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesVersion]["dashboard"]
+ val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesRelease]["dashboard"]
case "kubernetesDNSMasqSpec":
- val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesVersion]["dnsmasq"]
+ val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesRelease]["dnsmasq"]
case "kubernetesExecHealthzSpec":
- val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesVersion]["exechealthz"]
+ val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesRelease]["exechealthz"]
case "kubernetesHeapsterSpec":
- val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesVersion]["heapster"]
+ val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesRelease]["heapster"]
case "kubernetesTillerSpec":
- val = cloudSpecConfig.KubernetesSpecConfig.TillerImageBase + KubeConfigs[kubernetesVersion]["tiller"]
+ val = cloudSpecConfig.KubernetesSpecConfig.TillerImageBase + KubeConfigs[kubernetesRelease]["tiller"]
case "kubernetesKubeDNSSpec":
- val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesVersion]["dns"]
+ val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesRelease]["dns"]
case "kubernetesPodInfraContainerSpec":
- val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesVersion]["pause"]
+ val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[kubernetesRelease]["pause"]
case "kubernetesNodeStatusUpdateFrequency":
val = cs.Properties.OrchestratorProfile.KubernetesConfig.NodeStatusUpdateFrequency
case "kubernetesCtrlMgrNodeMonitorGracePeriod":
@@ -855,7 +855,7 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
case "cloudProviderRatelimitBucket":
val = strconv.Itoa(cs.Properties.OrchestratorProfile.KubernetesConfig.CloudProviderRateLimitBucket)
case "kubeBinariesSASURL":
- val = cloudSpecConfig.KubernetesSpecConfig.KubeBinariesSASURLBase + KubeConfigs[kubernetesVersion]["windowszip"]
+ val = cloudSpecConfig.KubernetesSpecConfig.KubeBinariesSASURLBase + KubeConfigs[kubernetesRelease]["windowszip"]
case "kubeClusterCidr":
val = "10.244.0.0/16"
case "kubeBinariesVersion":
