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

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
6 changed files with 9 additions and 5 deletions

View File

@@ -10,7 +10,7 @@ spec:
containers:
- name: kube-addon-manager
# 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:
- /bin/bash
- -c