From 95910cc40b6107951029a51dc38d7e1d5ca470bc Mon Sep 17 00:00:00 2001 From: Zihong Zheng Date: Thu, 8 Dec 2016 19:54:14 -0800 Subject: [PATCH] Keeps addon manager yamls in sync --- .../kube-manifests/kube-addon-manager.yaml | 19 ++++++++++++++----- .../salt/kube-addons/kube-addon-manager.yaml | 5 ++++- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cluster/gce/coreos/kube-manifests/kube-addon-manager.yaml b/cluster/gce/coreos/kube-manifests/kube-addon-manager.yaml index e63f23b5f38..ed55115c43a 100644 --- a/cluster/gce/coreos/kube-manifests/kube-addon-manager.yaml +++ b/cluster/gce/coreos/kube-manifests/kube-addon-manager.yaml @@ -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 diff --git a/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml b/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml index 7c4e3133519..05316f36e78 100644 --- a/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml +++ b/cluster/saltbase/salt/kube-addons/kube-addon-manager.yaml @@ -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