default to tiller 2.6.0 for k8s 1.7 (#1285)

* default to tiller 2.6.0 for k8s 1.7 * update default tiller version to 2.6
Azure · Aug 18, 2017 · 823d079 · 823d079
1 parent 13b0143
commit 823d079
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/acsengine/const.go b/pkg/acsengine/const.go
@@ -68,7 +68,7 @@ const (
 	// DefaultKubernetesCloudProviderRateLimitBucket is 10, takes effect if DefaultKubernetesCloudProviderRateLimit is true
 	DefaultKubernetesCloudProviderRateLimitBucket = 10
 	// DefaultTillerImage defines the Helm Tiller deployment version on Kubernetes Clusters
-	DefaultTillerImage = "tiller:v2.5.1"
+	DefaultTillerImage = "tiller:v2.6.0"
 )
 
 const (
@@ -148,7 +148,7 @@ var KubeConfigs = map[string]map[string]string{
 		"addonmanager":    "kube-addon-manager-amd64:v6.4-beta.2",
 		"dnsmasq":         "kube-dnsmasq-amd64:1.3",
 		"pause":           "pause-amd64:3.0",
-		"tiller":          DefaultTillerImage,
+		"tiller":          "tiller:v2.5.1",
 		"windowszip":      "v1.5.7intwinnat.zip",
 		"nodestatusfreq":  DefaultKubernetesNodeStatusUpdateFrequency,
 		"nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod,