github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #39827 from MrHohn/addon-manager-v6.2

Browse Source 
Automatic merge from submit-queue

Update kubectl to stable version for Addon Manager

Bumps up Addon Manager to v6.2, below images are pushed:
- gcr.io/google-containers/kube-addon-manager:v6.2
- gcr.io/google-containers/kube-addon-manager-amd64:v6.2
- gcr.io/google-containers/kube-addon-manager-arm:v6.2
- gcr.io/google-containers/kube-addon-manager-arm64:v6.2
- gcr.io/google-containers/kube-addon-manager-ppc64le:v6.2
- gcr.io/google-containers/kube-addon-manager-s390x:v6.2

@mikedanese 

cc @ixdy
This commit is contained in:
Kubernetes Submit Queue 2017-01-12 15:54:24 -08:00 committed by GitHub
commit ae04755d71
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/addons/addon-manager/CHANGELOG.md
View File

@ -1,3 +1,6 @@
### Version 6.2 (Thu January 12 2017 Zihong Zheng <zihongz@google.com>)
- Update kubectl to the stable version.
### Version 6.1 (Tue November 29 2016 Zihong Zheng <zihongz@google.com>) ### Version 6.1 (Tue November 29 2016 Zihong Zheng <zihongz@google.com>)
- Support pruning old Deployments. - Support pruning old Deployments.

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

@ -15,8 +15,8 @@
IMAGE=gcr.io/google-containers/kube-addon-manager IMAGE=gcr.io/google-containers/kube-addon-manager
ARCH?=amd64 ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
VERSION=v6.1 VERSION=v6.2
KUBECTL_VERSION?=v1.5.0-beta.2 KUBECTL_VERSION?=v1.5.2
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
BASEIMAGE?=bashell/alpine-bash BASEIMAGE?=bashell/alpine-bash

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

@ -11,7 +11,7 @@
"containers": [ "containers": [
{ {
"name": "kube-addon-manager", "name": "kube-addon-manager",
"image": "REGISTRY/kube-addon-manager-ARCH:v6.1", "image": "REGISTRY/kube-addon-manager-ARCH:v6.2",
"resources": { "resources": {
"requests": { "requests": {
"cpu": "5m", "cpu": "5m",

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

@ -11,7 +11,7 @@
"containers": [ "containers": [
{ {
"name": "kube-addon-manager", "name": "kube-addon-manager",
"image": "REGISTRY/kube-addon-manager-ARCH:v6.1", "image": "REGISTRY/kube-addon-manager-ARCH:v6.2",
"resources": { "resources": {
"requests": { "requests": {
"cpu": "5m", "cpu": "5m",

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

@ -12,7 +12,7 @@ spec:
# When updating version also bump it in: # When updating version also bump it in:
# - cluster/images/hyperkube/static-pods/addon-manager-singlenode.json # - cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
# - cluster/images/hyperkube/static-pods/addon-manager-multinode.json # - cluster/images/hyperkube/static-pods/addon-manager-multinode.json
image: gcr.io/google-containers/kube-addon-manager:v6.1 image: gcr.io/google-containers/kube-addon-manager:v6.2
command: command:
- /bin/bash - /bin/bash
- -c - -c