Keeps addon manager yamls in sync

This commit is contained in:
Zihong Zheng 2016-12-08 19:54:14 -08:00
parent 5628cde1bd
commit 95910cc40b
2 changed files with 18 additions and 6 deletions

View File

@ -3,23 +3,32 @@ kind: Pod
metadata:
name: kube-addon-manager
namespace: kube-system
version: v1
labels:
component: kube-addon-manager
spec:
hostNetwork: true
containers:
- name: kube-addon-manager
image: gcr.io/google-containers/kube-addon-manager:v1
image: gcr.io/google-containers/kube-addon-manager:v6.1
command:
- /bin/bash
- -c
- /opt/kube-addons.sh 1>>/var/log/kube-addon-manager.log 2>&1
resources:
requests:
cpu: 5m
# TODO(yifan): Figure out what's the memory usage should be here.
# See https://github.com/kubernetes/kubernetes/issues/23641.
memory: 100Mi
memory: 50Mi
volumeMounts:
- mountPath: /etc/kubernetes/
name: addons
readOnly: true
- mountPath: /var/log
name: varlog
readOnly: false
volumes:
- hostPath:
path: /etc/kubernetes/
name: addons
- hostPath:
path: /var/log
name: varlog

View File

@ -9,7 +9,10 @@ spec:
hostNetwork: true
containers:
- 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-singlenode.json
# - cluster/images/hyperkube/static-pods/addon-manager-multinode.json
# - cluster/gce/coreos/kube-manifests/kube-addon-manager.yaml
image: gcr.io/google-containers/kube-addon-manager:v6.1
command:
- /bin/bash