diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-20 20:56:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 20:56:02 -0800 |
| commit | b1f728d464e8ac4b80462b3dbaa87c631430368b (patch) | |
| tree | 677da0d5bd16409a64816666688dbcfcb8cb9d53 /files/origin-components | |
| parent | d5a464bddf793e64a2c3937f61b109e0f801e6b5 (diff) | |
| parent | b74651d1495a13db5545609e62010ebc1e073379 (diff) | |
| download | openshift-b1f728d464e8ac4b80462b3dbaa87c631430368b.tar.gz openshift-b1f728d464e8ac4b80462b3dbaa87c631430368b.tar.bz2 openshift-b1f728d464e8ac4b80462b3dbaa87c631430368b.tar.xz openshift-b1f728d464e8ac4b80462b3dbaa87c631430368b.zip | |
Merge pull request #6754 from spadgett/remove-old-console-config
Automatic merge from submit-queue.
Remove obsolete properties from console config map
Stop writing deprecated config to the console config map.
/hold
This can't be merged until https://github.com/openshift/origin-web-console-server/pull/20 merges.
Follow on to https://github.com/openshift/openshift-ansible/pull/6730
Diffstat (limited to 'files/origin-components')
| -rw-r--r-- | files/origin-components/console-config.yaml | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/files/origin-components/console-config.yaml b/files/origin-components/console-config.yaml index 901518b28..32a28775f 100644 --- a/files/origin-components/console-config.yaml +++ b/files/origin-components/console-config.yaml @@ -6,13 +6,10 @@ clusterInfo: 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 +extensions: + scriptURLs: [] + stylesheetURLs: [] + properties: null features: inactivityTimeoutMinutes: 0 servingInfo: @@ -24,19 +21,3 @@ servingInfo: 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 -extensionStylesheets: null -extensions: null -loggingPublicURL: "" -logoutURL: "" -masterPublicURL: https://127.0.0.1:8443 -metricsPublicURL: "" -publicURL: https://127.0.0.1:8443/console/ -# END deprecated properties |