Skip to content
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

Serve extension scripts and stylesheets as URLs #11

Merged
merged 1 commit into from
Jan 2, 2018

Conversation

spadgett
Copy link
Member

Switch extension scripts and stylesheets to use a URL rather than serving them from the master filesystem. The console index.html will reference the URLs directly in its <script> and <link> tags.

We plan to change the asset config extension scripts and stylesheets property names to make it clear that they're URLs as a follow-on.

/assign @jwforres
@deads2k @sspeiche FYI

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 11, 2017
return nil, err
}
c.addExtensionFiles(s.GenericAPIServer.Handler.NonGoRestfulMux)
if err := c.addWebConsoleConfig(s.GenericAPIServer.Handler.NonGoRestfulMux); err != nil {
Copy link
Member

Choose a reason for hiding this comment

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

surprised this part is removed from looking at it

@spadgett
Copy link
Member Author

/retest

@spadgett
Copy link
Member Author

@stevekuznetsov I assume this is a flake?

https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin_web_console_server_check/11/console

########## STARTING STAGE: RECORD THE STARTING METADATA ##########
+ [[ -s /var/lib/jenkins/jobs/test_pull_request_origin_web_console_server_check/workspace/activate ]]
+ source /var/lib/jenkins/jobs/test_pull_request_origin_web_console_server_check/workspace/activate
++ export VIRTUAL_ENV=/var/lib/jenkins/origin-ci-tool/352a8218d81bdad0819720bdd72fc1fd04c1c2de
++ VIRTUAL_ENV=/var/lib/jenkins/origin-ci-tool/352a8218d81bdad0819720bdd72fc1fd04c1c2de
++ export PATH=/var/lib/jenkins/origin-ci-tool/352a8218d81bdad0819720bdd72fc1fd04c1c2de/bin:/sbin:/usr/sbin:/bin:/usr/bin
++ PATH=/var/lib/jenkins/origin-ci-tool/352a8218d81bdad0819720bdd72fc1fd04c1c2de/bin:/sbin:/usr/sbin:/bin:/usr/bin
++ unset PYTHON_HOME
++ export OCT_CONFIG_HOME=/var/lib/jenkins/jobs/test_pull_request_origin_web_console_server_check/workspace/.config
++ OCT_CONFIG_HOME=/var/lib/jenkins/jobs/test_pull_request_origin_web_console_server_check/workspace/.config
++ mktemp
+ script=/tmp/tmp.aYuVZ0Krin
+ cat
+ chmod +x /tmp/tmp.aYuVZ0Krin
+ scp -F ./.config/origin-ci-tool/inventory/.ssh_config /tmp/tmp.aYuVZ0Krin openshiftdevel:/tmp/tmp.aYuVZ0Krin
+ ssh -F ./.config/origin-ci-tool/inventory/.ssh_config -t openshiftdevel 'bash -l -c "timeout 300 /tmp/tmp.aYuVZ0Krin"'
+ cd /data/src/github.com/openshift/aos-cd-jobs
+ trap 'exit 0' EXIT
+ sjb/gcs/started.py
++ exit 0
++ export status=FAILURE
++ status=FAILURE
+ set +o xtrace
########## FINISHED STAGE: FAILURE: RECORD THE STARTING METADATA [00h 05m 00s] ##########

@stevekuznetsov
Copy link

Yeah that is a weird one.

@spadgett spadgett changed the title [WIP] Serve extension scripts and stylesheets as URLs Serve extension scripts and stylesheets as URLs Jan 2, 2018
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 2, 2018
@jwforres
Copy link
Member

jwforres commented Jan 2, 2018

/lgtm
since we plan to update the names of the fields as a follow on

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 2, 2018
@openshift-merge-robot openshift-merge-robot merged commit 347fcaa into openshift:master Jan 2, 2018
@spadgett spadgett deleted the extension-url branch January 2, 2018 20:11
@spadgett
Copy link
Member Author

spadgett commented Jan 2, 2018

@abhgupta @jupierce Starting in 3.9, the web console will expect extension stylesheets and extension scripts to be URLs rather than files on the master filesystem. I'm working on openshift-ansible changes in openshift/openshift-ansible#6359

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants