Merge branch 'master' into r-22

2018-07-20 11:59:50 +02:00
parent 55dbef6f43 ade7b88d65
commit 0df7d4ccdf
5 changed files with 49 additions and 12 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.1
        image: quay.io/coreos/prometheus-operator:v0.22.1
@@ -32,6 +33,9 @@ spec:
          requests:
            cpu: 100m
            memory: 50Mi
+        securityContext:
+          allowPrivilegeEscalation: false
+          readOnlyRootFilesystem: true
      nodeSelector:
        beta.kubernetes.io/os: linux
      securityContext: