Merge pull request #18580 from spadgett/remove-console-rbac-template

Automatic merge from submit-queue.

Revert "allow webconsole to discover cluster information"

This reverts commit 98b9fa6.

/assign @deads2k 
/hold

Requires openshift/origin-web-console-server#31

Author: openshift-merge-robot

install/origin-web-console/rbac-template.yaml

@@ -21,7 +21,6 @@ import (
 
 const (
 	consoleNamespace             = "openshift-web-console"
-	consoleRBACTemplateName      = "web-console-server-rbac"
 	consoleAPIServerTemplateName = "openshift-web-console"
 	consoleConfigFile            = "install/origin-web-console/console-config.yaml"
 )
@@ -42,10 +41,6 @@ func (h *Helper) InstallWebConsole(f *clientcmd.Factory, imageFormat string, ser
 		return errors.NewError("cannot create web console project").WithCause(err)
 	}
 
-	if err = instantiateTemplate(templateClient.Template(), f, OpenshiftInfraNamespace, consoleRBACTemplateName, consoleNamespace, map[string]string{}, true); err != nil {
-		return errors.NewError("cannot instantiate template service broker permissions").WithCause(err)
-	}
-
 	// read in the config YAML file like the installer
 	consoleConfigYaml, err := bootstrap.Asset(consoleConfigFile)
 	if err != nil {

pkg/oc/bootstrap/bindata.go

@@ -127,7 +127,6 @@ var (
 	// the cluster version.
 	internalCurrentTemplateLocations = map[string]string{
 		"web console server template":       "install/origin-web-console/console-template.yaml",
-		"web console server rbac":           "install/origin-web-console/rbac-template.yaml",
 		"template service broker apiserver": "install/templateservicebroker/apiserver-template.yaml",
 	}
 	// internalPreviousTemplateLocations are templates that will be registered in an internal namespace.