Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update kubectl in addon-manager to use HPA in autoscaling/v1 #41587

Merged
merged 1 commit into from
Feb 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions cluster/addons/addon-manager/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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>)
- Update kubectl to v1.6.0-alpha.1 for supporting optional ConfigMap.

Expand Down
4 changes: 2 additions & 2 deletions cluster/addons/addon-manager/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
IMAGE=gcr.io/google-containers/kube-addon-manager
ARCH?=amd64
TEMP_DIR:=$(shell mktemp -d)
VERSION=v6.4-alpha.1
KUBECTL_VERSION?=v1.6.0-alpha.1
VERSION=v6.4-alpha.2
KUBECTL_VERSION?=v1.6.0-alpha.2

ifeq ($(ARCH),amd64)
BASEIMAGE?=bashell/alpine-bash
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"containers": [
{
"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": {
"requests": {
"cpu": "5m",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"containers": [
{
"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": {
"requests": {
"cpu": "5m",
Expand Down
3 changes: 2 additions & 1 deletion cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ spec:
# When updating version also bump it in:
# - cluster/images/hyperkube/static-pods/addon-manager-singlenode.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:
- /bin/bash
- -c
Expand Down
6 changes: 1 addition & 5 deletions test/kubemark/resources/manifests/kube-addon-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@ spec:
hostNetwork: true
containers:
- name: kube-addon-manager
# When updating version also bump it in:
# - 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
image: {{kube_docker_registry}}/kube-addon-manager:v6.4-alpha.2
command:
- /bin/bash
- -c
Expand Down