summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-01-26 15:07:44 -0500
committerGitHub <noreply@github.com>2018-01-26 15:07:44 -0500
commit13e73c31a827d6fca810e120a7b3b6573b2eeb4b (patch)
tree9212cac4e971e8a1ae54b732bb1b51f1a9650500
parentc73b77cb8489a0ac1f56457c19250ff217c6a47b (diff)
parent95baaab260839d9e5e2517a09ffb68768205d35a (diff)
downloadopenshift-13e73c31a827d6fca810e120a7b3b6573b2eeb4b.tar.gz
openshift-13e73c31a827d6fca810e120a7b3b6573b2eeb4b.tar.bz2
openshift-13e73c31a827d6fca810e120a7b3b6573b2eeb4b.tar.xz
openshift-13e73c31a827d6fca810e120a7b3b6573b2eeb4b.zip
Merge pull request #6893 from spadgett/console-requests
Add resource requests and prometheus annotations to console template
-rw-r--r--files/origin-components/console-template.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/files/origin-components/console-template.yaml b/files/origin-components/console-template.yaml
index 7bf2d0cf4..547e7a265 100644
--- a/files/origin-components/console-template.yaml
+++ b/files/origin-components/console-template.yaml
@@ -71,6 +71,10 @@ objects:
path: /
port: 8443
scheme: HTTPS
+ resources:
+ requests:
+ cpu: 100m
+ memory: 100Mi
nodeSelector: "${{NODE_SELECTOR}}"
volumes:
- name: serving-cert
@@ -112,6 +116,8 @@ objects:
app: openshift-web-console
annotations:
service.alpha.openshift.io/serving-cert-secret-name: webconsole-serving-cert
+ prometheus.io/scrape: "true"
+ prometheus.io/scheme: https
spec:
selector:
webconsole: "true"