diff --git a/cluster/addons/metrics-server/metrics-server-deployment.yaml b/cluster/addons/metrics-server/metrics-server-deployment.yaml index 5b19bf769a3..e82eb9d74a2 100644 --- a/cluster/addons/metrics-server/metrics-server-deployment.yaml +++ b/cluster/addons/metrics-server/metrics-server-deployment.yaml @@ -7,6 +7,19 @@ metadata: kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile --- +apiVersion: v1 +kind: ConfigMap +metadata: + name: metrics-server-config + namespace: kube-system + labels: + kubernetes.io/cluster-service: "true" + addonmanager.kubernetes.io/mode: EnsureExists +data: + NannyConfiguration: |- + apiVersion: nannyconfig/v1alpha1 + kind: NannyConfiguration +--- apiVersion: extensions/v1beta1 kind: Deployment metadata: @@ -43,7 +56,7 @@ spec: name: https protocol: TCP - name: metrics-server-nanny - image: gcr.io/google_containers/addon-resizer:1.7 + image: gcr.io/google_containers/addon-resizer:1.8.1 resources: limits: cpu: 100m @@ -60,8 +73,12 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + volumeMounts: + - name: metrics-server-config-volume + mountPath: /etc/config command: - /pod_nanny + - --config-dir=/etc/config - --cpu=40m - --extra-cpu=0.5m - --memory=140Mi @@ -71,6 +88,10 @@ spec: - --container=metrics-server - --poll-period=300000 - --estimator=exponential + volumes: + - name: metrics-server-config-volume + configMap: + name: metrics-server-config tolerations: - key: "CriticalAddonsOnly" operator: "Exists"