Merge pull request #18191 from spadgett/cluster-up-remove-old-asset-config

Automatic merge from submit-queue (batch tested with PRs 18191, 18264, 18235, 18251, 18271).

cluster up: remove obsolete asset config properties

Follow on to #18114 
Requires openshift/origin-web-console-server#20

/assign @deads2k 
@jwforres @sdodson FYI
/hold

Author: openshift-merge-robot

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
   clusterResourceOverridesEnabled: false
@@ -25,19 +22,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

pkg/oc/bootstrap/bindata.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 {