scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump addon-manager to v6.4-beta.1

Browse Source
This commit is contained in:
Zihong Zheng
2017-03-08 16:07:02 -08:00
parent ea019ebb23
commit e613570f28
5 changed files with 8 additions and 8 deletions
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.4-beta.1 (Wed March 8 2017 Zihong Zheng <zihongz@google.com>)
- Create EnsureExists class addons before Reconcile class addons.
### Version 6.4-alpha.3 (Fri February 24 2017 Zihong Zheng <zihongz@google.com>) ### Version 6.4-alpha.3 (Fri February 24 2017 Zihong Zheng <zihongz@google.com>)
- Support 'ensure exist' class addon and use addon-manager specific label. - Support 'ensure exist' class addon and use addon-manager specific label.

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

@@ -15,11 +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.4-alpha.3 VERSION=v6.4-beta.1
# TODO: Current Addon Manager is built with kubectl on head KUBECTL_VERSION?=v1.6.0-beta.2
# (GitCommit:"17375fc59fff39135af63bd1750bb07c36ef873b").
# Should use next released kubectl once available.
KUBECTL_VERSION?=v1.6.0-alpha.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.4-alpha.3", "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-beta.1",
"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.4-alpha.3", "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-beta.1",
"resources": { "resources": {
"requests": { "requests": {
"cpu": "5m", "cpu": "5m",

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

@@ -13,7 +13,7 @@ spec:
# - 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
# - test/kubemark/resources/manifests/kube-addon-manager.yaml # - test/kubemark/resources/manifests/kube-addon-manager.yaml
image: gcr.io/google-containers/kube-addon-manager:v6.4-alpha.3 image: gcr.io/google-containers/kube-addon-manager:v6.4-beta.1
command: command:
- /bin/bash - /bin/bash
- -c - -c