Skip to content

Conversation

spadgett
Copy link
Member

This reverts commit 6555bed.

/assign @deads2k

Requires openshift/origin-web-catalog#642

Follow on openshift-ansible and origin PRs will remove the console RBAC template, which isn't needed anymore.

@spadgett
Copy link
Member Author

/hold

@openshift-ci-robot openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 12, 2018
@deads2k
Copy link
Contributor

deads2k commented Feb 12, 2018

I'm fine with it. You'll want to be sure that regular users can see these resources.

@spadgett
Copy link
Member Author

Yeah, we're already requesting clusterserviceclasses in the console. We can check if any have spec.clusterServiceBrokerName with template-service-broker.

PRs for origin and openshift-ansible:

openshift/origin#18580
openshift/openshift-ansible#7120

@spadgett
Copy link
Member Author

Console changes have merged.

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 13, 2018

var versionTemplate = template.Must(template.New("webConsoleVersion").Parse(`
window.OPENSHIFT_VERSION = {
openshift: "{{ .OpenShiftVersion | js}}",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you no longer need to expose this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed anymore. We had to switch the request to the client anyway to fix a bug:

openshift/origin-web-console#2734

@deads2k
Copy link
Contributor

deads2k commented Feb 13, 2018

question. lgtm otherwise

@spadgett spadgett added the lgtm Indicates that a PR is ready to be merged. label Feb 19, 2018
@spadgett
Copy link
Member Author

Stage RECORD THE STARTING METADATA [00h 05m 01s] failed.

/retest

@openshift-merge-robot openshift-merge-robot merged commit 4488567 into openshift:master Feb 19, 2018
@spadgett spadgett deleted the no-autodetection branch February 19, 2018 15:13
openshift-merge-robot added a commit to openshift/origin that referenced this pull request Feb 19, 2018
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
openshift-merge-robot added a commit to openshift/openshift-ansible that referenced this pull request Mar 1, 2018
Automatic merge from submit-queue.

Remove RBAC console template

The console is changing to discover if the template service broker is
running by looking at the service classes on the client. This means the
console no longer needs the RBAC template. It also no longer needs to
manually trigger a rollout after the template service broker is
installed or removed.

Requires:

openshift/origin-web-console-server#31
openshift/origin-web-console#2800
openshift/origin-web-catalog#642

Corresponding origin PR:

openshift/origin#18580

This will fail tests until the origin-web-console image is updated with the changes in the origin-web-console-server PR.

/assign @sdodson 
@deads2k cc
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants