Merge branch 'master' into r-22

This commit is contained in:
Lucas Serven
2018-07-20 11:59:50 +02:00
5 changed files with 49 additions and 12 deletions

View File

@@ -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:

View File

@@ -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

View File

@@ -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