Merge remote-tracking branch 'master' into release-0.22

2018-07-24 17:25:40 +02:00
parent 8edd622f2e e47243b413
commit b7a9751f09
11 changed files with 68 additions and 30 deletions
--- a/manifests/0prometheus-operator-deployment.yaml
+++ b/manifests/0prometheus-operator-deployment.yaml
@@ -18,6 +18,7 @@ spec:
      containers:
      - args:
        - --kubelet-service=kube-system/kubelet
+        - -logtostderr=true
        - --config-reloader-image=quay.io/coreos/configmap-reload:v0.0.1
        - --prometheus-config-reloader=quay.io/coreos/prometheus-config-reloader:v0.22.2
        image: quay.io/coreos/prometheus-operator:v0.22.2
@@ -28,10 +29,13 @@ spec:
        resources:
          limits:
            cpu: 200m
-            memory: 100Mi
+            memory: 200Mi
          requests:
            cpu: 100m
-            memory: 50Mi
+            memory: 100Mi
+        securityContext:
+          allowPrivilegeEscalation: false
+          readOnlyRootFilesystem: true
      nodeSelector:
        beta.kubernetes.io/os: linux
      securityContext: