summaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2018-01-16 23:08:14 -0500
committerGitHub <noreply@github.com>2018-01-16 23:08:14 -0500
commitd5241bd08465db72d5a4c4c36d7c4a14f151d688 (patch)
treee78130d8b3e7d8c4e7df508334a57858402057f4 /files
parent214595c511002fd40f8134231ddea4a8e1f9f563 (diff)
parentb498f10bf3e0c755dba6ce45913bd163475989fb (diff)
downloadopenshift-d5241bd08465db72d5a4c4c36d7c4a14f151d688.tar.gz
openshift-d5241bd08465db72d5a4c4c36d7c4a14f151d688.tar.bz2
openshift-d5241bd08465db72d5a4c4c36d7c4a14f151d688.tar.xz
openshift-d5241bd08465db72d5a4c4c36d7c4a14f151d688.zip
Merge pull request #6730 from spadgett/console-config-api-changes
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