Merge pull request kubernetes#47501 from mwielgus/ca-0.6.0-alpha2

Kubernetes Submit Queue · web-flow · commit 1a857ca551d1 · 2017-06-14T02:54:11.000-07:00
Automatic merge from submit-queue

Bump cluster autoscaler to 0.6.0-alpha2

Fixes npe in kubernetes config.
diff --git a/cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest b/cluster/saltbase/salt/cluster-autoscaler/cluster-autoscaler.manifest
@@ -25,7 +25,7 @@
         "containers": [
             {
                 "name": "cluster-autoscaler",
-                "image": "gcr.io/google_containers/cluster-autoscaler:v0.6.0-alpha1",
+                "image": "gcr.io/google_containers/cluster-autoscaler:v0.6.0-alpha2",
                 "command": [
                     "./run.sh",
                     "--kubernetes=http://127.0.0.1:8080?inClusterConfig=f",

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`"containers": [`
`26`	`26`	`{`
`27`	`27`	`"name": "cluster-autoscaler",`
`28`		`- "image": "gcr.io/google_containers/cluster-autoscaler:v0.6.0-alpha1",`
	`28`	`+ "image": "gcr.io/google_containers/cluster-autoscaler:v0.6.0-alpha2",`
`29`	`29`	`"command": [`
`30`	`30`	`"./run.sh",`
`31`	`31`	`"--kubernetes=http://127.0.0.1:8080?inClusterConfig=f",`