mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #40776 from MrHohn/addon-manager-v6.4
Automatic merge from submit-queue (batch tested with PRs 40758, 39145, 40776) Bumps addon-manager to v6.4-alpha.1 for supporting optional ConfigMap From #40382. Bumps up addon-manager to use v1.6.0-alpha.1 kubectl for the optional ConfigMap feature. Below images have been pushed: - gcr.io/google-containers/kube-addon-manager:v6.4-alpha.1 - gcr.io/google-containers/kube-addon-manager-amd64:v6.4-alpha.1 - gcr.io/google-containers/kube-addon-manager-arm:v6.4-alpha.1 - gcr.io/google-containers/kube-addon-manager-arm64:v6.4-alpha.1 - gcr.io/google-containers/kube-addon-manager-ppc64le:v6.4-alpha.1 - gcr.io/google-containers/kube-addon-manager-s390x:v6.4-alpha.1 @liggitt @bowei
This commit is contained in:
commit
0bb31560c2
@ -1,3 +1,6 @@
|
|||||||
|
### 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.
|
||||||
|
|
||||||
### Version 6.3 (Fri January 27 2017 Lucas Käldström <lucas.kaldstrom@hotmail.co.uk>)
|
### Version 6.3 (Fri January 27 2017 Lucas Käldström <lucas.kaldstrom@hotmail.co.uk>)
|
||||||
- Updated the arm base image to `armhf/busybox` and now using qemu v2.7 for emulation.
|
- Updated the arm base image to `armhf/busybox` and now using qemu v2.7 for emulation.
|
||||||
|
|
||||||
|
@ -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.3
|
VERSION=v6.4-alpha.1
|
||||||
KUBECTL_VERSION?=v1.5.2
|
KUBECTL_VERSION?=v1.6.0-alpha.1
|
||||||
|
|
||||||
ifeq ($(ARCH),amd64)
|
ifeq ($(ARCH),amd64)
|
||||||
BASEIMAGE?=bashell/alpine-bash
|
BASEIMAGE?=bashell/alpine-bash
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
"containers": [
|
"containers": [
|
||||||
{
|
{
|
||||||
"name": "kube-addon-manager",
|
"name": "kube-addon-manager",
|
||||||
"image": "REGISTRY/kube-addon-manager-ARCH:v6.2",
|
"image": "REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.1",
|
||||||
"resources": {
|
"resources": {
|
||||||
"requests": {
|
"requests": {
|
||||||
"cpu": "5m",
|
"cpu": "5m",
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
"containers": [
|
"containers": [
|
||||||
{
|
{
|
||||||
"name": "kube-addon-manager",
|
"name": "kube-addon-manager",
|
||||||
"image": "REGISTRY/kube-addon-manager-ARCH:v6.2",
|
"image": "REGISTRY/kube-addon-manager-ARCH:v6.4-alpha.1",
|
||||||
"resources": {
|
"resources": {
|
||||||
"requests": {
|
"requests": {
|
||||||
"cpu": "5m",
|
"cpu": "5m",
|
||||||
|
@ -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.2
|
image: gcr.io/google-containers/kube-addon-manager:v6.4-alpha.1
|
||||||
command:
|
command:
|
||||||
- /bin/bash
|
- /bin/bash
|
||||||
- -c
|
- -c
|
||||||
|
Loading…
Reference in New Issue
Block a user