remove version specific pieces of the heapster deployment. Rollback reziser to 1.7 (#1076)

parts/kubernetesmasteraddons-heapster-deployment.yaml

@@ -1,8 +1,23 @@
----
 kind: Deployment
+apiVersion: extensions/v1beta1
+metadata:
+  labels:
+    k8s-app: heapster
+    kubernetes.io/cluster-service: "true"
+  namespace: kube-system
+  name: heapster
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      k8s-app: heapster
   template:
+    metadata:
+      labels:
+        k8s-app: heapster
+      annotations:
+        scheduler.alpha.kubernetes.io/critical-pod: ""
+        scheduler.alpha.kubernetes.io/tolerations: "[{\"key\":\"CriticalAddonsOnly\",\"operator\":\"Exists\"}]"
     spec:
       containers:
       - image: <kubernetesHeapsterSpec>
@@ -25,7 +40,7 @@ spec:
         - "--memory=140Mi"
         - "--extra-memory=4Mi"
         - "--threshold=5"
-        - "--deployment=heapster-v1.2.0-beta.1"
+        - "--deployment=heapster"
         - "--container=heapster"
         - "--poll-period=300000"
         - "--estimator=exponential"
@@ -48,23 +63,3 @@ spec:
           name: MY_POD_NAMESPACE
       nodeSelector:
         beta.kubernetes.io/os: linux
-    metadata:
-      labels:
-        k8s-app: heapster
-        version: v1.2.0
-      annotations:
-        scheduler.alpha.kubernetes.io/critical-pod: ""
-        scheduler.alpha.kubernetes.io/tolerations: "[{\"key\":\"CriticalAddonsOnly\",\"operator\":\"Exists\"}]"
-  selector:
-    matchLabels:
-      k8s-app: heapster
-      version: v1.2.0
-apiVersion: extensions/v1beta1
-metadata:
-  labels:
-    k8s-app: heapster
-    version: v1.2.0
-    kubernetes.io/cluster-service: "true"
-  namespace: kube-system
-  name: heapster-v1.2.0
-

pkg/acsengine/const.go

@@ -106,7 +106,7 @@ var KubeImages = map[string]map[string]string{
 		"hyperkube":       "hyperkube-amd64:v1.7.1",
 		"dashboard":       "kubernetes-dashboard-amd64:v1.6.1",
 		"exechealthz":     "exechealthz-amd64:1.2",
-		"addonresizer":    "addon-resizer:2.0",
+		"addonresizer":    "addon-resizer:1.7",
 		"heapster":        "heapster:v1.4.0",
 		"dns":             "k8s-dns-kube-dns-amd64:1.14.4",
 		"addonmanager":    "kube-addon-manager-amd64:v6.4-beta.2",
@@ -125,16 +125,16 @@ var KubeImages = map[string]map[string]string{
 		"ratelimitbucket": strconv.Itoa(DefaultKubernetesCloudProviderRateLimitBucket),
 	},
 	api.Kubernetes170: {
-		"hyperkube":       "hyperkube-amd64:v1.7.0",
-		"dashboard":       "kubernetes-dashboard-amd64:v1.6.1",
-		"exechealthz":     "exechealthz-amd64:1.2",
-		"addonresizer":    "addon-resizer:2.0",
-		"heapster":        "heapster:v1.4.0",
-		"dns":             "k8s-dns-kube-dns-amd64:1.14.4",
-		"addonmanager":    "kube-addon-manager-amd64:v6.4-beta.2",
-		"dnsmasq":         "k8s-dns-dnsmasq-amd64:1.14.4",
-		"pause":           "pause-amd64:3.0",
-		"windowszip":      "v1.7.0intwinnat.zip",
+		"hyperkube":    "hyperkube-amd64:v1.7.0",
+		"dashboard":    "kubernetes-dashboard-amd64:v1.6.1",
+		"exechealthz":  "exechealthz-amd64:1.2",
+		"addonresizer": "addon-resizer:1.7",
+		"heapster":     "heapster:v1.4.0",
+		"dns":          "k8s-dns-kube-dns-amd64:1.14.4",
+		"addonmanager": "kube-addon-manager-amd64:v6.4-beta.2",
+		"dnsmasq":      "k8s-dns-dnsmasq-amd64:1.14.4",
+		"pause":        "pause-amd64:3.0",
+		"windowszip":   "v1.7.0intwinnat.zip",
 		"nodestatusfreq":  DefaultKubernetesNodeStatusUpdateFrequency,
 		"nodegraceperiod": DefaultKubernetesCtrlMgrNodeMonitorGracePeriod,
 		"podeviction":     DefaultKubernetesCtrlMgrPodEvictionTimeout,