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

Merge pull request #37655 from MrHohn/addon-manager-deployment

Browse Source 
Automatic merge from submit-queue

Fixes Addon Manager's pruning issue for old Deployments

Fixes #37641.

Attaches the `last-applied`annotations to the existing Deployments for pruning.

Below images are built and pushed:
- gcr.io/google-containers/kube-addon-manager:v6.1
- gcr.io/google-containers/kube-addon-manager-amd64:v6.1
- gcr.io/google-containers/kube-addon-manager-arm:v6.1
- gcr.io/google-containers/kube-addon-manager-arm64:v6.1
- gcr.io/google-containers/kube-addon-manager-ppc64le:v6.1

@mikedanese 

cc @saad-ali @krousey
This commit is contained in:
Kubernetes Submit Queue 2016-11-30 10:39:29 -08:00 committed by GitHub
commit 56a591b69d
6 changed files with 9 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.1 (Tue November 29 2016 Zihong Zheng <zihongz@google.com>)
- Support pruning old Deployments.
### Version 6.0 (Fri November 18 2016 Zihong Zheng <zihongz@google.com>) ### Version 6.0 (Fri November 18 2016 Zihong Zheng <zihongz@google.com>)
- Upgrade Addon Manager to use `kubectl apply`. - Upgrade Addon Manager to use `kubectl apply`.

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.0 VERSION=v6.1
KUBECTL_VERSION?=v1.5.0-beta.1 KUBECTL_VERSION?=v1.5.0-beta.2
ifeq ($(ARCH),amd64) ifeq ($(ARCH),amd64)
BASEIMAGE?=bashell/alpine-bash BASEIMAGE?=bashell/alpine-bash

1
cluster/addons/addon-manager/kube-addons.sh
View File

@ -195,6 +195,7 @@ done
# otherwise they would be leaked during upgrade. # otherwise they would be leaked during upgrade.
log INFO "== Annotating the old addon resources at $(date -Is) ==" log INFO "== Annotating the old addon resources at $(date -Is) =="
annotate_addons ReplicationController annotate_addons ReplicationController
annotate_addons Deployment
# Create new addon resources by apply (with --prune=false). # Create new addon resources by apply (with --prune=false).
# The old RCs will not fight for pods created by new Deployments with the same label because the `controllerRef` feature. # The old RCs will not fight for pods created by new Deployments with the same label because the `controllerRef` feature.

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.0", "image": "REGISTRY/kube-addon-manager-ARCH:v6.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.0", "image": "REGISTRY/kube-addon-manager-ARCH:v6.1",
"resources": { "resources": {
"requests": { "requests": {
"cpu": "5m", "cpu": "5m",

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

@ -10,7 +10,7 @@ spec:
containers: containers:
- name: kube-addon-manager - name: kube-addon-manager
# When updating version also bump it in cluster/images/hyperkube/static-pods/addon-manager.json # When updating version also bump it in cluster/images/hyperkube/static-pods/addon-manager.json
image: gcr.io/google-containers/kube-addon-manager:v6.0 image: gcr.io/google-containers/kube-addon-manager:v6.1
command: command:
- /bin/bash - /bin/bash
- -c - -c