From 146c024950d79fd4588c5e3581d7fb6f7f34eab3 Mon Sep 17 00:00:00 2001
From: Frederic Branczyk <fbranczyk@gmail.com>
Date: Mon, 28 Aug 2017 15:53:09 +0200
Subject: [PATCH] kube-prometheus: bump kube-state-metrics to v1.0.1 release
---
.../kube-state-metrics-deployment.yaml | 36 +++++++++++++++++--
.../kube-state-metrics-role-binding.yaml | 12 +++++++
.../kube-state-metrics-role.yaml | 15 ++++++++
3 files changed, 61 insertions(+), 2 deletions(-)
create mode 100644 manifests/kube-state-metrics/kube-state-metrics-role-binding.yaml
create mode 100644 manifests/kube-state-metrics/kube-state-metrics-role.yaml
diff --git a/manifests/kube-state-metrics/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics/kube-state-metrics-deployment.yaml
index 3b24611b..bd313f21 100644
--- a/manifests/kube-state-metrics/kube-state-metrics-deployment.yaml
+++ b/manifests/kube-state-metrics/kube-state-metrics-deployment.yaml
@@ -12,10 +12,16 @@ spec:
serviceAccountName: kube-state-metrics
containers:
- name: kube-state-metrics
- image: quay.io/coreos/kube-state-metrics:v1.0.0
+ image: quay.io/coreos/kube-state-metrics:v1.0.1
ports:
- name: metrics
containerPort: 8080
+ readinessProbe:
+ httpGet:
+ path: /healthz
+ port: 8080
+ initialDelaySeconds: 5
+ timeoutSeconds: 5
resources:
requests:
memory: 100Mi
@@ -23,4 +29,30 @@ spec:
limits:
memory: 200Mi
cpu: 200m
-
+ - name: addon-resizer
+ image: gcr.io/google_containers/addon-resizer:1.0
+ 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/manifests/kube-state-metrics/kube-state-metrics-role-binding.yaml b/manifests/kube-state-metrics/kube-state-metrics-role-binding.yaml
new file mode 100644
index 00000000..a93c3965
--- /dev/null
+++ b/manifests/kube-state-metrics/kube-state-metrics-role-binding.yaml
@@ -0,0 +1,12 @@
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: RoleBinding
+metadata:
+ name: kube-state-metrics
+roleRef:
+ apiGroup: rbac.authorization.k8s.io
+ kind: Role
+ name: kube-state-metrics-resizer
+subjects:
+- kind: ServiceAccount
+ name: kube-state-metrics
+
diff --git a/manifests/kube-state-metrics/kube-state-metrics-role.yaml b/manifests/kube-state-metrics/kube-state-metrics-role.yaml
new file mode 100644
index 00000000..6bf21fb8
--- /dev/null
+++ b/manifests/kube-state-metrics/kube-state-metrics-role.yaml
@@ -0,0 +1,15 @@
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: Role
+metadata:
+ name: kube-state-metrics-resizer
+rules:
+- apiGroups: [""]
+ resources:
+ - pods
+ verbs: ["get"]
+- apiGroups: ["extensions"]
+ resources:
+ - deployments
+ resourceNames: ["kube-state-metrics"]
+ verbs: ["get", "update"]
+
--
GitLab