github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Update kubectl in addon-manager to use HPA in autoscaling/v1 instead of extensions/v1beta1

Browse Source
This commit is contained in:
Zihong Zheng 2017-02-16 11:17:17 -08:00
parent 30e8953fad
commit 2c8e89820a
6 changed files with 10 additions and 10 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.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.
### Version 6.4-alpha.1 (Wed February 1 2017 Zihong Zheng <zihongz@google.com>) ### Version 6.4-alpha.1 (Wed February 1 2017 Zihong Zheng <zihongz@google.com>)
- Update kubectl to v1.6.0-alpha.1 for supporting optional ConfigMap. - Update kubectl to v1.6.0-alpha.1 for supporting optional ConfigMap.

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.4-alpha.1 VERSION=v6.4-alpha.2
KUBECTL_VERSION?=v1.6.0-alpha.1 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.1", "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.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.4-alpha.1", "image": "REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.2",
"resources": { "resources": {
"requests": { "requests": {
"cpu": "5m", "cpu": "5m",

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

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

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

@ -9,11 +9,7 @@ spec:
hostNetwork: true hostNetwork: true
containers: containers:
- name: kube-addon-manager - name: kube-addon-manager
# When updating version also bump it in: image: {{kube_docker_registry}}/kube-addon-manager:v6.4-alpha.2
# - cluster/images/hyperkube/static-pods/addon-manager-singlenode.json
# - cluster/images/hyperkube/static-pods/addon-manager-multinode.json
# - cluster/gce/coreos/kube-manifests/kube-addon-manager.yaml
image: {{kube_docker_registry}}/kube-addon-manager:v6.4-alpha.1
command: command:
- /bin/bash - /bin/bash
- -c - -c