From 25bbb3f305111359e5b38592f5e1b1e8b222efba Mon Sep 17 00:00:00 2001 From: Kenny Leung Date: Thu, 31 May 2018 12:55:56 -0700 Subject: [PATCH] Rev the controller manager version to pick up machine deployment controller (#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 | 2 +- cloud/terraform/pods.go | 2 +- cloud/vsphere/pods.go | 4 ++-- cmd/controller-manager/Makefile | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cloud/google/pods.go b/cloud/google/pods.go index 3f5f8f8b3f1a..671bd2416a54 100644 --- a/cloud/google/pods.go +++ b/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() { diff --git a/cloud/terraform/pods.go b/cloud/terraform/pods.go index 65ce74ad9fae..7358a034f495 100644 --- a/cloud/terraform/pods.go +++ b/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() { diff --git a/cloud/vsphere/pods.go b/cloud/vsphere/pods.go index db83f8def03a..19fd8b102f60 100644 --- a/cloud/vsphere/pods.go +++ b/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() { diff --git a/cmd/controller-manager/Makefile b/cmd/controller-manager/Makefile index d409f2fb1d25..9d906058e7a2 100644 --- a/cmd/controller-manager/Makefile +++ b/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