summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-01-11 02:13:33 -0800
committerGitHub <noreply@github.com>2018-01-11 02:13:33 -0800
commit46f0a28d9ea4d9d599fc93ea2786eff51067432d (patch)
treed10dd826b5c7af1e0bae22e141ea3a4c2d0012c9
parentc5570478de299cb852c530183e8994edf828943c (diff)
parent75f245f01bd3f1d96c87f0d8a2ebe8a13f86c7ec (diff)
downloadopenshift-46f0a28d9ea4d9d599fc93ea2786eff51067432d.tar.gz
openshift-46f0a28d9ea4d9d599fc93ea2786eff51067432d.tar.bz2
openshift-46f0a28d9ea4d9d599fc93ea2786eff51067432d.tar.xz
openshift-46f0a28d9ea4d9d599fc93ea2786eff51067432d.zip
Merge pull request #6665 from spadgett/update-console-template
Automatic merge from submit-queue. Update web console template Update the web console template based on changes in https://github.com/openshift/origin/pull/17575 /assign @sdodson @deads2k fyi
-rw-r--r--files/origin-components/console-template.yaml11
1 files changed, 9 insertions, 2 deletions
diff --git a/files/origin-components/console-template.yaml b/files/origin-components/console-template.yaml
index b2a6569fd..7bf2d0cf4 100644
--- a/files/origin-components/console-template.yaml
+++ b/files/origin-components/console-template.yaml
@@ -14,6 +14,7 @@ parameters:
- name: IMAGE
value: openshift/origin-web-console:latest
- name: NAMESPACE
+ # This namespace cannot be changed. Only `openshift-web-console` is supported.
value: openshift-web-console
- name: LOGLEVEL
value: "0"
@@ -51,6 +52,7 @@ objects:
command:
- "/usr/bin/origin-web-console"
- "--audit-log-path=-"
+ - "-v=${LOGLEVEL}"
- "--config=/var/webconsole-config/webconsole-config.yaml"
ports:
- containerPort: 8443
@@ -64,15 +66,20 @@ objects:
path: /healthz
port: 8443
scheme: HTTPS
+ livenessProbe:
+ httpGet:
+ path: /
+ port: 8443
+ scheme: HTTPS
nodeSelector: "${{NODE_SELECTOR}}"
volumes:
- name: serving-cert
secret:
- defaultMode: 420
+ defaultMode: 400
secretName: webconsole-serving-cert
- name: webconsole-config
configMap:
- defaultMode: 420
+ defaultMode: 440
name: webconsole-config
# to create the config for the web console