Merge pull request #1616 from directionless/adjustable-kube-state-metrics

Configure kube-state-metrics
2018-07-17 20:13:23 +02:00
parent efe686c0c0 04cf9ce35a
commit b1f4e9136d
4 changed files with 45 additions and 12 deletions
--- a/manifests/kube-state-metrics-deployment.yaml
+++ b/manifests/kube-state-metrics-deployment.yaml
@@ -55,11 +55,11 @@ spec:
        name: kube-state-metrics
        resources:
          limits:
-            cpu: 102m
-            memory: 180Mi
+            cpu: 100m
+            memory: 150Mi
          requests:
-            cpu: 102m
-            memory: 180Mi
+            cpu: 100m
+            memory: 150Mi
      - command:
        - /pod_nanny
        - --container=kube-state-metrics
--- a/manifests/kube-state-metrics-serviceMonitor.yaml
+++ b/manifests/kube-state-metrics-serviceMonitor.yaml
@@ -12,6 +12,7 @@ spec:
    interval: 30s
    port: https-main
    scheme: https
+    scrapeTimeout: 30s
    tlsConfig:
      insecureSkipVerify: true
  - bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token