Rev the controller manager version to pick up machine deployment cont…

…roller (#260)

This is to pick up PR #143, which allows for the creation of machine
deployments. Rolling update should now work.

Update apiserver for vsphere as that is what is being used for gce and
terraform.

cloud/google/pods.go

@@ -33,7 +33,7 @@ import (
 )
 
 var apiServerImage = "gcr.io/k8s-cluster-api/cluster-apiserver:0.0.5"
-var controllerManagerImage = "gcr.io/k8s-cluster-api/controller-manager:0.0.5"
+var controllerManagerImage = "gcr.io/k8s-cluster-api/controller-manager:0.0.6"
 var machineControllerImage = "gcr.io/k8s-cluster-api/gce-machine-controller:0.0.12"
 
 func init() {

cloud/terraform/pods.go

@@ -33,7 +33,7 @@ import (
 )
 
 var apiServerImage = "gcr.io/k8s-cluster-api/cluster-apiserver:0.0.5"
-var controllerManagerImage = "gcr.io/k8s-cluster-api/controller-manager:0.0.5"
+var controllerManagerImage = "gcr.io/k8s-cluster-api/controller-manager:0.0.6"
 var machineControllerImage = "gcr.io/k8s-cluster-api/terraform-machine-controller:0.0.6"
 
 func init() {

cloud/vsphere/pods.go

@@ -32,8 +32,8 @@ import (
 	"sigs.k8s.io/cluster-api/cloud/vsphere/config"
 )
 
-var apiServerImage = "gcr.io/k8s-cluster-api/cluster-apiserver:0.0.4"
-var controllerManagerImage = "gcr.io/k8s-cluster-api/controller-manager:0.0.4"
+var apiServerImage = "gcr.io/k8s-cluster-api/cluster-apiserver:0.0.5"
+var controllerManagerImage = "gcr.io/k8s-cluster-api/controller-manager:0.0.6"
 var machineControllerImage = "gcr.io/k8s-cluster-api/vsphere-machine-controller:0.0.1"
 
 func init() {

cmd/controller-manager/Makefile

@@ -18,7 +18,7 @@ GCR_BUCKET = k8s-cluster-api
 PREFIX = gcr.io/$(GCR_BUCKET)
 DEV_PREFIX ?= gcr.io/$(shell gcloud config get-value project)
 NAME = controller-manager
-TAG = 0.0.5
+TAG = 0.0.6
 
 image:
 	docker build -t "$(PREFIX)/$(NAME):$(TAG)" -f ./Dockerfile ../..
@@ -31,7 +31,7 @@ fix_gcs_permissions:
 	gsutil acl ch -u AllUsers:READ gs://artifacts.$(GCR_BUCKET).appspot.com
 	gsutil -m acl ch -r -u AllUsers:READ gs://artifacts.$(GCR_BUCKET).appspot.com
 
-dev_image: 
+dev_image:
 	docker build -t "$(DEV_PREFIX)/$(NAME):$(TAG)-dev" -f ./Dockerfile ../..
 
 dev_push: dev_image