diff --git a/CHANGES.md b/CHANGES.md index 7e3f4afe..604b258c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,6 +8,7 @@ Notable changes between versions. * Update Prometheus from v2.13.0 to v2.13.1 * Refresh rules, alerts, and dashboards from upstreams +* Remove addon-resizer from kube-state-metrics ([#575](https://github.com/poseidon/typhoon/pull/575)) * Update Grafana from v6.4.2 to v6.4.3 ## v1.16.2 diff --git a/addons/prometheus/exporters/kube-state-metrics/deployment.yaml b/addons/prometheus/exporters/kube-state-metrics/deployment.yaml index c9694eab..b4f0a47f 100644 --- a/addons/prometheus/exporters/kube-state-metrics/deployment.yaml +++ b/addons/prometheus/exporters/kube-state-metrics/deployment.yaml @@ -37,33 +37,6 @@ spec: readinessProbe: httpGet: path: / - port: 8080 + port: 8081 initialDelaySeconds: 5 timeoutSeconds: 5 - - name: addon-resizer - image: k8s.gcr.io/addon-resizer:1.8.5 - resources: - limits: - cpu: 100m - memory: 30Mi - requests: - cpu: 100m - memory: 30Mi - env: - - name: MY_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: MY_POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - command: - - /pod_nanny - - --container=kube-state-metrics - - --cpu=100m - - --extra-cpu=1m - - --memory=100Mi - - --extra-memory=2Mi - - --threshold=5 - - --deployment=kube-state-metrics diff --git a/addons/prometheus/exporters/kube-state-metrics/resizer-role-binding.yaml b/addons/prometheus/exporters/kube-state-metrics/resizer-role-binding.yaml deleted file mode 100644 index f10a2bcc..00000000 --- a/addons/prometheus/exporters/kube-state-metrics/resizer-role-binding.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: kube-state-metrics - namespace: monitoring -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: kube-state-metrics -subjects: -- kind: ServiceAccount - name: kube-state-metrics - namespace: monitoring diff --git a/addons/prometheus/exporters/kube-state-metrics/resizer-role.yaml b/addons/prometheus/exporters/kube-state-metrics/resizer-role.yaml deleted file mode 100644 index 6d12b57c..00000000 --- a/addons/prometheus/exporters/kube-state-metrics/resizer-role.yaml +++ /dev/null @@ -1,31 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: Role -metadata: - name: kube-state-metrics - namespace: monitoring -rules: -- apiGroups: - - "" - resources: - - pods - verbs: - - get -- apiGroups: - - extensions - resources: - - deployments - resourceNames: - - kube-state-metrics - verbs: - - get - - update -- apiGroups: - - apps - resources: - - deployments - resourceNames: - - kube-state-metrics - verbs: - - get - - update -