update component versions for v0.14.0 (Azure#2406)

* update Ubuntu image to 16.04.201802220 * update to latest go-dev image * update CNI plugin to latest version * update dashboard to v1.8.3 * update heapster and addon-resizer * update kube-addon-manager to v8.6 * revert addon-resizer for 1.7 clusters * revert addon-sizer bump for 1.8 and below * const not exported * generalize k8s component version implementation * lint * unit tests and nil return if unknown
tesharp · Mar 15, 2018 · 021500e · 021500e
1 parent 2a20053
commit 021500e
Show file tree

Hide file tree

Showing 8 changed files with 448 additions and 753 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -8,7 +8,7 @@ jobs:
   test:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.8.1
+      - image: quay.io/deis/go-dev:v1.9.0
         environment:
           GOPATH: /go
     steps:
@@ -34,7 +34,7 @@ jobs:
   swarm-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.8.1
+      - image: quay.io/deis/go-dev:v1.9.0
         environment:
           GOPATH: /go
     steps:
@@ -61,7 +61,7 @@ jobs:
   dcos-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.8.1
+      - image: quay.io/deis/go-dev:v1.9.0
         environment:
           GOPATH: /go
     steps:
@@ -84,7 +84,7 @@ jobs:
   swarmmode-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.8.1
+      - image: quay.io/deis/go-dev:v1.9.0
         environment:
           GOPATH: /go
     steps:
@@ -111,7 +111,7 @@ jobs:
   k8s-1.7-release-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.8.1
+      - image: quay.io/deis/go-dev:v1.9.0
         environment:
           GOPATH: /go
     steps:
@@ -140,7 +140,7 @@ jobs:
   k8s-windows-1.7-release-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.8.1
+      - image: quay.io/deis/go-dev:v1.9.0
         environment:
           GOPATH: /go
     steps:
@@ -168,7 +168,7 @@ jobs:
   k8s-1.9-release-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.8.1
+      - image: quay.io/deis/go-dev:v1.9.0
         environment:
           GOPATH: /go
     steps:
@@ -197,7 +197,7 @@ jobs:
   k8s-1.8-release-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.8.1
+      - image: quay.io/deis/go-dev:v1.9.0
         environment:
           GOPATH: /go
     steps:
@@ -226,7 +226,7 @@ jobs:
   k8s-windows-1.8-release-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.8.1
+      - image: quay.io/deis/go-dev:v1.9.0
         environment:
           GOPATH: /go
     steps:
@@ -254,7 +254,7 @@ jobs:
   k8s-windows-1.9-release-e2e:
     working_directory: /go/src/github.com/Azure/acs-engine
     docker:
-      - image: quay.io/deis/go-dev:v1.8.1
+      - image: quay.io/deis/go-dev:v1.9.0
         environment:
           GOPATH: /go
     steps:

diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ GITTAG := $(VERSION_SHORT)
 endif
 
 REPO_PATH := github.com/Azure/acs-engine
-DEV_ENV_IMAGE := quay.io/deis/go-dev:v1.8.1
+DEV_ENV_IMAGE := quay.io/deis/go-dev:v1.9.0
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_OPTS := --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR} ${DEV_ENV_VARS}
 DEV_ENV_CMD := docker run ${DEV_ENV_OPTS} ${DEV_ENV_IMAGE}

diff --git a/parts/agentparams.t b/parts/agentparams.t
@@ -46,7 +46,7 @@
       "type": "string"
     }, 
     "{{.Name}}osImageVersion": {
-      "defaultValue": "16.04.201801260",
+      "defaultValue": "16.04.201802220",
       "metadata": {
         "description": "OS image version."
       },

diff --git a/parts/masterparams.t b/parts/masterparams.t
@@ -102,7 +102,7 @@
       "type": "string"
     }, 
     "osImageVersion": {
-      "defaultValue": "16.04.201801260",
+      "defaultValue": "16.04.201802220",
       "metadata": {
         "description": "OS image version."
       },

diff --git a/pkg/acsengine/const.go b/pkg/acsengine/const.go
@@ -86,9 +86,6 @@ const (
 	DefaultACIConnectorAddonName = "aci-connector"
 	// DefaultDashboardAddonName is the name of the kubernetes-dashboard addon deployment
 	DefaultDashboardAddonName = "kubernetes-dashboard"
-	// DefaultTillerImage defines the Helm Tiller deployment version on Kubernetes Clusters
-	// TODO deprecate this usage, we should be favoring a more frequent upgrade cycle that pins fresh tiller versions to specific k8s versions
-	DefaultTillerImage = "tiller:v2.8.1"
 	// DefaultACIConnectorImage defines the ACI Connector deployment version on Kubernetes Clusters
 	DefaultACIConnectorImage = "virtual-kubelet:latest"
 	// DefaultKubernetesDNSServiceIP specifies the IP address that kube-dns
@@ -109,8 +106,6 @@ const (
 	DefaultEtcdVersion = "3.2.16"
 	// DefaultEtcdDiskSize specifies the default size for Kubernetes master etcd disk volumes in GB
 	DefaultEtcdDiskSize = "128"
-	// DefaultReschedulerImage defines the rescheduler deployment version on Kubernetes Clusters
-	DefaultReschedulerImage = "rescheduler:v0.3.1"
 	// DefaultReschedulerAddonName is the name of the rescheduler addon deployment
 	DefaultReschedulerAddonName = "rescheduler"
 	// DefaultMetricsServerAddonName is the name of the kubernetes Metrics server addon deployment

diff --git a/pkg/acsengine/defaults.go b/pkg/acsengine/defaults.go
@@ -18,6 +18,9 @@ const (
 	// https://github.com/Azure/azure-container-networking/releases/download/${AZURE_PLUGIN_VER}/azure-vnet-cni-linux-amd64-${AZURE_PLUGIN_VER}.tgz
 	// to https://acs-mirror.azureedge.net/cni/
 	AzureCniPluginVer = "v1.0.2"
+	// CNIPluginVer specifies the version of CNI implementation
+	// https://github.com/containernetworking/plugins
+	CNIPluginVer = "v0.7.0"
 )
 
 var (
@@ -30,7 +33,7 @@ var (
 		KubeBinariesSASURLBase:           "https://acs-mirror.azureedge.net/wink8s/",
 		WindowsPackageSASURLBase:         "https://acs-mirror.azureedge.net/wink8s/",
 		WindowsTelemetryGUID:             "fb801154-36b9-41bc-89c2-f4d4f05472b0",
-		CNIPluginsDownloadURL:            "https://acs-mirror.azureedge.net/cni/cni-plugins-amd64-latest.tgz",
+		CNIPluginsDownloadURL:            "https://acs-mirror.azureedge.net/cni/cni-plugins-amd64-" + CNIPluginVer + ".tgz",
 		VnetCNILinuxPluginsDownloadURL:   "https://acs-mirror.azureedge.net/cni/azure-vnet-cni-linux-amd64-" + AzureCniPluginVer + ".tgz",
 		VnetCNIWindowsPluginsDownloadURL: "https://acs-mirror.azureedge.net/cni/azure-vnet-cni-windows-amd64-" + AzureCniPluginVer + ".zip",
 	}
@@ -54,7 +57,7 @@ var (
 		ImageOffer:     "UbuntuServer",
 		ImageSku:       "16.04-LTS",
 		ImagePublisher: "Canonical",
-		ImageVersion:   "16.04.201801260",
+		ImageVersion:   "16.04.201802220",
 	}
 
 	//DefaultRHELOSImageConfig is the RHEL Linux distribution.