kube-prometheus: Use non-root and Prometheus v2.1.0

contrib/kube-prometheus/manifests/kube-state-metrics/kube-state-metrics-deployment.yaml

@@ -10,6 +10,9 @@ spec:
         app: kube-state-metrics
     spec:
       serviceAccountName: kube-state-metrics
+      securityContext:
+        runAsNonRoot: true
+        runAsUser: 65534
       containers:
       - name: kube-rbac-proxy-main
         image: quay.io/brancz/kube-rbac-proxy:v0.2.0
@@ -70,8 +73,8 @@ spec:
           - /pod_nanny
           - --container=kube-state-metrics
           - --cpu=100m
-          - --extra-cpu=1m
-          - --memory=100Mi
-          - --extra-memory=2Mi
+          - --extra-cpu=2m
+          - --memory=150Mi
+          - --extra-memory=30Mi
           - --threshold=5
           - --deployment=kube-state-metrics

contrib/kube-prometheus/manifests/prometheus/prometheus-k8s.yaml

@@ -6,7 +6,7 @@ metadata:
     prometheus: k8s
 spec:
   replicas: 2
-  version: v2.0.0
+  version: v2.1.0
   serviceAccountName: prometheus-k8s
   serviceMonitorSelector:
     matchExpressions:

example/rbac/prometheus-operator/prometheus-operator.yaml

@@ -23,8 +23,11 @@ spec:
         resources:
           limits:
             cpu: 200m
-            memory: 100Mi
+            memory: 300Mi
           requests:
             cpu: 100m
             memory: 50Mi
       serviceAccountName: prometheus-operator
+       securityContext:
+         runAsNonRoot: true
+         runAsUser: 65534