github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

Bumps addon-manager to v6.4-alpha.3 and updates template files

Browse Source
This commit is contained in:
Zihong Zheng 2017-02-24 16:47:29 -08:00
parent 7eb9b81d67
commit 64ba52ae71
6 changed files with 11 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.4-alpha.3 (Fri February 24 2017 Zihong Zheng <zihongz@google.com>)
- Support 'ensure exist' class addon and use addon-manager specific label.
### Version 6.4-alpha.2 (Wed February 16 2017 Zihong Zheng <zihongz@google.com>) ### Version 6.4-alpha.2 (Wed February 16 2017 Zihong Zheng <zihongz@google.com>)
- Update kubectl to v1.6.0-alpha.2 to use HPA in autoscaling/v1 instead of extensions/v1beta1. - Update kubectl to v1.6.0-alpha.2 to use HPA in autoscaling/v1 instead of extensions/v1beta1.

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

@ -15,7 +15,10 @@
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.2 VERSION=v6.4-alpha.3
# TODO: Current Addon Manager is built with kubectl on head
# (GitCommit:"17375fc59fff39135af63bd1750bb07c36ef873b").
# Should use next released kubectl once available.
KUBECTL_VERSION?=v1.6.0-alpha.2 KUBECTL_VERSION?=v1.6.0-alpha.2
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)

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.2", "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.3",
"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.2", "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.3",
"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.2 image: gcr.io/google-containers/kube-addon-manager:v6.4-alpha.3
command: command:
- /bin/bash - /bin/bash
- -c - -c

2
test/kubemark/resources/manifests/kube-addon-manager.yaml
View File

@ -9,7 +9,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: kube-addon-manager - name: kube-addon-manager
image: {{kube_docker_registry}}/kube-addon-manager:v6.4-alpha.2 image: {{kube_docker_registry}}/kube-addon-manager:v6.4-alpha.3
command: command:
- /bin/bash - /bin/bash
- -c - -c