From 7b2bc8425946dd234fa71684e3506be419e6944e Mon Sep 17 00:00:00 2001 From: Tim Allclair Date: Wed, 9 May 2018 11:33:13 -0700 Subject: [PATCH 1/3] Fix addon-resizer version - 1.8.3 --- cluster/addons/prometheus/kube-state-metrics-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cluster/addons/prometheus/kube-state-metrics-deployment.yaml b/cluster/addons/prometheus/kube-state-metrics-deployment.yaml index 6b98774145c..f79fdd5a8d4 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 From 8a50e7ed4e8671d10fbb80258933c6d17af9ff61 Mon Sep 17 00:00:00 2001 From: Tim Allclair Date: Thu, 20 Sep 2018 17:27:27 -0700 Subject: [PATCH 2/3] Add kube-state-metrics nanny configuration --- .../kube-state-metrics-deployment.yaml | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/cluster/addons/prometheus/kube-state-metrics-deployment.yaml b/cluster/addons/prometheus/kube-state-metrics-deployment.yaml index f79fdd5a8d4..61996fae570 100644 --- a/cluster/addons/prometheus/kube-state-metrics-deployment.yaml +++ b/cluster/addons/prometheus/kube-state-metrics-deployment.yaml @@ -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 + From 0057624bde4090a36241be495e7c301e657a2e59 Mon Sep 17 00:00:00 2001 From: Tim Allclair Date: Mon, 15 Oct 2018 10:47:25 -0700 Subject: [PATCH 3/3] Update heapster eventer addon-resizer to 1.8.3 --- .../addons/cluster-monitoring/google/heapster-controller.yaml | 2 +- .../googleinfluxdb/heapster-controller-combined.yaml | 2 +- .../addons/cluster-monitoring/influxdb/heapster-controller.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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: