summaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorSamuel Padgett <spadgett@redhat.com>2018-01-15 09:06:16 -0500
committerSamuel Padgett <spadgett@redhat.com>2018-01-16 16:16:01 -0500
commitb498f10bf3e0c755dba6ce45913bd163475989fb (patch)
treeeb8e58b6e4f5221bfe8500fc43af5ee769c2979c /files
parent9424e6ffe7919c9651e860fe606895c7ab6b7ca8 (diff)
downloadopenshift-b498f10bf3e0c755dba6ce45913bd163475989fb.tar.gz
openshift-b498f10bf3e0c755dba6ce45913bd163475989fb.tar.bz2
openshift-b498f10bf3e0c755dba6ce45913bd163475989fb.tar.xz
openshift-b498f10bf3e0c755dba6ce45913bd163475989fb.zip
Update console config for API changes
Diffstat (limited to 'files')
-rw-r--r--files/origin-components/console-config.yaml41
1 files changed, 31 insertions, 10 deletions
diff --git a/files/origin-components/console-config.yaml b/files/origin-components/console-config.yaml
index e104e8028..901518b28 100644
--- a/files/origin-components/console-config.yaml
+++ b/files/origin-components/console-config.yaml
@@ -1,5 +1,34 @@
-kind: WebConsoleConfiguration
apiVersion: webconsole.config.openshift.io/v1
+kind: WebConsoleConfiguration
+clusterInfo:
+ consolePublicURL: https://127.0.0.1:8443/console/
+ loggingPublicURL: ""
+ logoutPublicURL: ""
+ masterPublicURL: https://127.0.0.1:8443
+ metricsPublicURL: ""
+# TODO: The new extensions properties cannot be set until
+# origin-web-console-server has been updated with the API changes since
+# `extensions` in the old asset config was an array.
+#extensions:
+# scriptURLs: []
+# stylesheetURLs: []
+# properties: null
+features:
+ inactivityTimeoutMinutes: 0
+servingInfo:
+ bindAddress: 0.0.0.0:8443
+ bindNetwork: tcp4
+ certFile: /var/serving-cert/tls.crt
+ clientCA: ""
+ keyFile: /var/serving-cert/tls.key
+ maxRequestsInFlight: 0
+ namedCertificates: null
+ requestTimeoutSeconds: 0
+
+# START deprecated properties
+# These properties have been renamed and will be removed from the install
+# in a future pull. Keep both the old and new properties for now so that
+# the install is not broken while the origin-web-console image is updated.
extensionDevelopment: false
extensionProperties: null
extensionScripts: null
@@ -10,12 +39,4 @@ logoutURL: ""
masterPublicURL: https://127.0.0.1:8443
metricsPublicURL: ""
publicURL: https://127.0.0.1:8443/console/
-servingInfo:
- bindAddress: 0.0.0.0:8443
- bindNetwork: tcp4
- certFile: /var/serving-cert/tls.crt
- clientCA: ""
- keyFile: /var/serving-cert/tls.key
- maxRequestsInFlight: 0
- namedCertificates: null
- requestTimeoutSeconds: 0
+# END deprecated properties