github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 06:01:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #35622 from gmarek/revert

Browse Source 
Revert "increment kube-addon-manager version number"
This commit is contained in:
Marek Grabowski
2016-10-26 14:46:00 +02:00
committed by GitHub
parent f046acdf78 c9f8558a61
commit be340665e0
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/addon-manager/Makefile
View File

@@ -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

2
cluster/images/hyperkube/static-pods/addon-manager-multinode.json
View File

@@ -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",

2
cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
View File

@@ -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",

2
cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
View File

@@ -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