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

Update web console config #20

Merged
merged 3 commits into from
Jan 19, 2018

Conversation

spadgett
Copy link
Member

Adopt API changes from openshift/api#31

Requires openshift/origin#18114
Requires openshift/openshift-ansible#6730
Replaces #19

/assign @deads2k
@jwforres 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jan 15, 2018
@spadgett
Copy link
Member Author

/retest

@spadgett spadgett changed the title [WIP] Update web console config Update web console config Jan 15, 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 15, 2018
@spadgett
Copy link
Member Author

/hold

@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 15, 2018
for i, scriptURL := range config.ExtensionScripts {
if _, scriptURLErrs := ValidateSecureURL(scriptURL, fldPath.Child("extensionScripts").Index(i)); len(scriptURLErrs) > 0 {
if len(config.LogoutPublicURL) > 0 {
_, urlErrs := ValidateURL(config.LogoutPublicURL, fldPath.Child("logoutPublicURL"))
Copy link
Contributor

Choose a reason for hiding this comment

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

why isn't this required to be secure?

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

Does it need to be?

I like all things secure. If it wasn't before, I guess it doesn't have to be today.

@deads2k
Copy link
Contributor

deads2k commented Jan 15, 2018

one question. lgtm otherwise

@deads2k
Copy link
Contributor

deads2k commented Jan 15, 2018

/lgtm

@spadgett
Copy link
Member Author

origin and openshift-ansible 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 Jan 19, 2018
@spadgett
Copy link
Member Author

/retest

@openshift-merge-robot openshift-merge-robot merged commit 310bdab into openshift:master Jan 19, 2018
@spadgett spadgett deleted the update-config branch January 19, 2018 18:39
openshift-merge-robot added a commit to openshift/openshift-ansible that referenced this pull request Jan 21, 2018
Automatic merge from submit-queue.

Remove obsolete properties from console config map

Stop writing deprecated config to the console config map.

/hold

This can't be merged until openshift/origin-web-console-server#20 merges.
Follow on to #6730
mjudeikis pushed a commit to mjudeikis/openshift-ansible that referenced this pull request Jan 22, 2018
…nfig

Automatic merge from submit-queue.

Remove obsolete properties from console config map

Stop writing deprecated config to the console config map.

/hold

This can't be merged until openshift/origin-web-console-server#20 merges.
Follow on to openshift#6730
openshift-merge-robot added a commit to openshift/origin that referenced this pull request Jan 25, 2018
…onfig

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

Successfully merging this pull request may close these issues.

4 participants