From c9f8558a610891023dfd948fb702ce36e4adce06 Mon Sep 17 00:00:00 2001 From: gmarek Date: Wed, 26 Oct 2016 14:33:08 +0200 Subject: [PATCH] Revert "increment kube-addon-manager version number;" This reverts commit 1f599af79194cee0e1e07c10766fd1790fc69a9f. --- cluster/addons/addon-manager/Makefile | 2 +- .../images/hyperkube/static-pods/addon-manager-multinode.json | 2 +- .../images/hyperkube/static-pods/addon-manager-singlenode.json | 2 +- cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cluster/addons/addon-manager/Makefile b/cluster/addons/addon-manager/Makefile index 1024a288165..25eb87ad330 100644 --- a/cluster/addons/addon-manager/Makefile +++ b/cluster/addons/addon-manager/Makefile @@ -15,7 +15,7 @@ IMAGE=gcr.io/google-containers/kube-addon-manager ARCH?=amd64 TEMP_DIR:=$(shell mktemp -d) -VERSION=v5.2 +VERSION=v5.1 KUBECTL_VERSION?=v1.5.0-alpha.1 # amd64 and arm has "stable" binaries pushed for v1.2, arm64 and ppc64le hasn't so they have to fetch the latest alpha diff --git a/cluster/images/hyperkube/static-pods/addon-manager-multinode.json b/cluster/images/hyperkube/static-pods/addon-manager-multinode.json index 80d0e99c38a..a27b283003b 100644 --- a/cluster/images/hyperkube/static-pods/addon-manager-multinode.json +++ b/cluster/images/hyperkube/static-pods/addon-manager-multinode.json @@ -11,7 +11,7 @@ "containers": [ { "name": "kube-addon-manager", - "image": "REGISTRY/kube-addon-manager-ARCH:v5.2", + "image": "REGISTRY/kube-addon-manager-ARCH:v5.1", "resources": { "requests": { "cpu": "5m", diff --git a/cluster/images/hyperkube/static-pods/addon-manager-singlenode.json b/cluster/images/hyperkube/static-pods/addon-manager-singlenode.json index cd979978ed3..91baed268dc 100644 --- a/cluster/images/hyperkube/static-pods/addon-manager-singlenode.json +++ b/cluster/images/hyperkube/static-pods/addon-manager-singlenode.json @@ -11,7 +11,7 @@ "containers": [ { "name": "kube-addon-manager", - "image": "REGISTRY/kube-addon-manager-ARCH:v5.2", + "image": "REGISTRY/kube-addon-manager-ARCH:v5.1", "resources": { "requests": { "cpu": "5m", diff --git a/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml b/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml index 081ce096feb..99c07000f92 100644 --- a/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml +++ b/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml @@ -11,7 +11,7 @@ spec: containers: - name: kube-addon-manager # When updating version also bump it in cluster/images/hyperkube/static-pods/addon-manager.json - image: gcr.io/google-containers/kube-addon-manager:v5.2 + image: gcr.io/google-containers/kube-addon-manager:v5.1 resources: requests: cpu: 5m