diff --git a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml index d2864c14b0b..fe6b23c1f44 100644 --- a/cluster/addons/cluster-monitoring/google/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/google/heapster-controller.yaml @@ -115,7 +115,7 @@ spec: # Specifies the smallest cluster (defined in number of nodes) # resources will be scaled to. - --minClusterSize={{ heapster_min_cluster_size }} - - image: k8s.gcr.io/addon-resizer:1.8.2 + - image: k8s.gcr.io/addon-resizer:1.8.3 name: eventer-nanny resources: limits: diff --git a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml index fb5446626aa..02e739e3764 100644 --- a/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml +++ b/cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml @@ -116,7 +116,7 @@ spec: # Specifies the smallest cluster (defined in number of nodes) # resources will be scaled to. - --minClusterSize={{ heapster_min_cluster_size }} - - image: k8s.gcr.io/addon-resizer:1.8.2 + - image: k8s.gcr.io/addon-resizer:1.8.3 name: eventer-nanny resources: limits: diff --git a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml index 8c22aaece75..51d1d622f09 100644 --- a/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml @@ -115,7 +115,7 @@ spec: # Specifies the smallest cluster (defined in number of nodes) # resources will be scaled to. - --minClusterSize={{ heapster_min_cluster_size }} - - image: k8s.gcr.io/addon-resizer:1.8.2 + - image: k8s.gcr.io/addon-resizer:1.8.3 name: eventer-nanny resources: limits: diff --git a/cluster/addons/prometheus/kube-state-metrics-deployment.yaml b/cluster/addons/prometheus/kube-state-metrics-deployment.yaml index 6b98774145c..61996fae570 100644 --- a/cluster/addons/prometheus/kube-state-metrics-deployment.yaml +++ b/cluster/addons/prometheus/kube-state-metrics-deployment.yaml @@ -39,7 +39,7 @@ spec: initialDelaySeconds: 5 timeoutSeconds: 5 - name: addon-resizer - image: k8s.gcr.io/addon-resizer:1.7 + image: k8s.gcr.io/addon-resizer:1.8.3 resources: limits: cpu: 100m @@ -56,8 +56,12 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace + volumeMounts: + - name: config-volume + mountPath: /etc/config command: - /pod_nanny + - --config-dir=/etc/config - --container=kube-state-metrics - --cpu=100m - --extra-cpu=1m @@ -65,3 +69,23 @@ spec: - --extra-memory=2Mi - --threshold=5 - --deployment=kube-state-metrics + volumes: + - name: config-volume + configMap: + name: kube-state-metrics-config +--- +# Config map for resource configuration. +apiVersion: v1 +kind: ConfigMap +metadata: + name: kube-state-metrics-config + namespace: kube-system + labels: + k8s-app: kube-state-metrics + kubernetes.io/cluster-service: "true" + addonmanager.kubernetes.io/mode: Reconcile +data: + NannyConfiguration: |- + apiVersion: nannyconfig/v1alpha1 + kind: NannyConfiguration +