Skip to content

console autodetection #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 18, 2018

Conversation

deads2k
Copy link
Contributor

@deads2k deads2k commented Jan 11, 2018

Adds auto-detection (on startup only!) for kube version, openshift version, and TSB detection.

/assign spadgett
@jwforres fyi

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 11, 2018
@deads2k
Copy link
Contributor Author

deads2k commented Jan 11, 2018

depends on openshift/origin#18075

@spadgett
Copy link
Member

/hold
until the origin change merges

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 11, 2018
@spadgett
Copy link
Member

TSB is installed after the console in openshift-ansible. We probably have force a redeploy of the console after TSB install since we're only checking it on console startup.

@sdodson fyi

@spadgett
Copy link
Member

This also depends on openshift-ansible changes to apply the console RBAC template.

@spadgett
Copy link
Member

openshift-ansible changes: openshift/openshift-ansible#6706

}
if cfg.ExtraConfig.TemplateServiceBrokerEnabled == nil {
enabled := false
_, err := restClient.RESTClient().Get().AbsPath("/apis/servicecatalog.k8s.io/v1beta1/clusterservicebrokers/template-service-broker").Do().Raw()
Copy link
Member

Choose a reason for hiding this comment

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

Will this work correctly if service catalog is not installed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will this work correctly if service catalog is not installed?

Yes, it will return a 404 and simply set itself to "enabled=false"

@spadgett
Copy link
Member

Currently in cluster up and in an ansible install, the web console is installed before template service broker. We'll have to decide how to handle that since detection will fail on first run. We might just move the console install until after service catalog and brokers.

@yapei
Copy link

yapei commented Jan 16, 2018

Does service broker failure will affect web console installation if we move console after service catalog and broker? Seems not, web console only need detect if TSB is enabled or not, no matter service broker status, is this the case? @spadgett

@spadgett
Copy link
Member

No, the only bad effect is that the templates will show up twice in the catalog. We'll look at working around that limitation, however. We might need redeploy the console after the service catalog playbook since it can be run separately.

openshift-merge-robot added a commit to openshift/openshift-ansible that referenced this pull request Jan 16, 2018
Automatic merge from submit-queue.

Add console RBAC template

Required for openshift/origin-web-console-server#18
Origin changes: openshift/origin#18075

/assign @sdodson 
/cc @deads2k
@spadgett
Copy link
Member

The openshift-ansible changes merged

openshift-merge-robot added a commit to openshift/origin that referenced this pull request Jan 17, 2018
Automatic merge from submit-queue (batch tested with PRs 18075, 17725, 16766, 18070, 18113).

allow webconsole to discover cluster information

Adds permissions to the webconsole to inspect what clusterservicebrokers are present.

@pmorie please confirm this is a non-escalating resource which can be generally viewed.
@openshift/sig-security 
@spadgett @jwforres you'll need this before merging openshift/origin-web-console-server#18
@spadgett
Copy link
Member

openshift/origin#18075 has 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 Jan 18, 2018
@spadgett
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 18, 2018
@openshift-merge-robot openshift-merge-robot merged commit 6b57076 into openshift:master Jan 18, 2018
openshift-merge-robot added a commit to openshift/origin that referenced this pull request Jan 20, 2018
Automatic merge from submit-queue (batch tested with PRs 18163, 18139, 18193, 18194, 16180).

cluster up: install console after template service broker

The console will check if the template service broker is running, but
only on startup. Install the console after the broker so that this check
works for `oc cluster up --service-catalog`.

/assign @deads2k 
cc @jwforres 

See openshift/origin-web-console-server#18
See https://bugzilla.redhat.com/show_bug.cgi?id=1534316
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.

5 participants