diff --git a/install/origin-web-console/console-config.yaml b/install/origin-web-console/console-config.yaml index 901518b28fb8..32a28775f829 100644 --- a/install/origin-web-console/console-config.yaml +++ b/install/origin-web-console/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 diff --git a/pkg/oc/bootstrap/bindata.go b/pkg/oc/bootstrap/bindata.go index fccf445eaa65..804237acfa77 100644 --- a/pkg/oc/bootstrap/bindata.go +++ b/pkg/oc/bootstrap/bindata.go @@ -14902,13 +14902,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: @@ -14920,22 +14917,6 @@ 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 `) func installOriginWebConsoleConsoleConfigYamlBytes() ([]byte, error) { diff --git a/pkg/oc/bootstrap/docker/openshift/webconsole.go b/pkg/oc/bootstrap/docker/openshift/webconsole.go index 4d4d956bdfaa..00c2aee60e0b 100644 --- a/pkg/oc/bootstrap/docker/openshift/webconsole.go +++ b/pkg/oc/bootstrap/docker/openshift/webconsole.go @@ -73,20 +73,6 @@ func (h *Helper) InstallWebConsole(f *clientcmd.Factory, imageFormat string, ser clusterInfo["metricsPublicURL"] = metricsURL } - // START deprecated properties - // These properties have been renamed and will be removed from cluster up - // in a future pull. Keep both the old and new properties for now so that - // the cluster up is not broken while the origin-web-console image is updated. - consoleConfig["publicURL"] = publicURL - consoleConfig["masterPublicURL"] = masterURL - if len(loggingURL) > 0 { - consoleConfig["loggingPublicURL"] = loggingURL - } - if len(metricsURL) > 0 { - consoleConfig["metricsPublicURL"] = metricsURL - } - // END deprecated properties - // serialize it back out as a string to use as a template parameter updatedConfig, err := yaml.Marshal(consoleConfig) if err != nil { diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go index ecb2107ad00d..8e0e7666b85e 100644 --- a/test/extended/testdata/bindata.go +++ b/test/extended/testdata/bindata.go @@ -28802,13 +28802,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: @@ -28820,22 +28817,6 @@ 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 `) func installOriginWebConsoleConsoleConfigYamlBytes() ([]byte, error) {