diff options
| author | Zohar Galor <zgalor@redhat.com> | 2017-10-19 11:11:32 +0300 |
|---|---|---|
| committer | Zohar Galor <zgalor@redhat.com> | 2017-10-23 14:44:28 +0300 |
| commit | 3792787d7e7cc3b8c44ccbbc83a3c2f9a9299f38 (patch) | |
| tree | fa23626996b87b8580340b5963356a4ccd0aa5a1 /roles/openshift_prometheus/templates | |
| parent | 64f452f9081e380db41acf588a28fe4bb79a4e9e (diff) | |
| download | openshift-3792787d7e7cc3b8c44ccbbc83a3c2f9a9299f38.tar.gz openshift-3792787d7e7cc3b8c44ccbbc83a3c2f9a9299f38.tar.bz2 openshift-3792787d7e7cc3b8c44ccbbc83a3c2f9a9299f38.tar.xz openshift-3792787d7e7cc3b8c44ccbbc83a3c2f9a9299f38.zip | |
Switch to stateful set in prometheus
Also update prometheus and alert-buffer image versions, and add prometheus, and oauth-proxy arguments to align with origin template
Diffstat (limited to 'roles/openshift_prometheus/templates')
| -rw-r--r-- | roles/openshift_prometheus/templates/prometheus.j2 (renamed from roles/openshift_prometheus/templates/prometheus_deployment.j2) | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/roles/openshift_prometheus/templates/prometheus_deployment.j2 b/roles/openshift_prometheus/templates/prometheus.j2 index 66eab6df4..81f043491 100644 --- a/roles/openshift_prometheus/templates/prometheus_deployment.j2 +++ b/roles/openshift_prometheus/templates/prometheus.j2 @@ -1,12 +1,14 @@ -apiVersion: extensions/v1beta1 -kind: Deployment +apiVersion: apps/v1beta1 +kind: StatefulSet metadata: name: prometheus namespace: {{ namespace }} labels: app: prometheus spec: - replicas: {{ prom_replicas|default(1) }} + updateStrategy: + type: RollingUpdate + podManagementPolicy: Parallel selector: provider: openshift matchLabels: @@ -60,6 +62,8 @@ spec: - -tls-key=/etc/tls/private/tls.key - -client-secret-file=/var/run/secrets/kubernetes.io/serviceaccount/token - -cookie-secret-file=/etc/proxy/secrets/session_secret + - -openshift-ca=/etc/pki/tls/cert.pem + - -openshift-ca=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt - -skip-auth-regex=^/metrics volumeMounts: - mountPath: /etc/tls/private @@ -72,6 +76,7 @@ spec: - name: prometheus args: - --storage.tsdb.retention=6h + - --storage.tsdb.min-block-duration=2m - --config.file=/etc/prometheus/prometheus.yml - --web.listen-address=localhost:9090 image: "{{ openshift_prometheus_image_prometheus }}" @@ -133,6 +138,8 @@ spec: - -tls-key=/etc/tls/private/tls.key - -client-secret-file=/var/run/secrets/kubernetes.io/serviceaccount/token - -cookie-secret-file=/etc/proxy/secrets/session_secret + - -openshift-ca=/etc/pki/tls/cert.pem + - -openshift-ca=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt volumeMounts: - mountPath: /etc/tls/private name: alerts-tls |