Update WebConsoleConfiguration #31

spadgett · 2018-01-12T13:33:28Z

Add new stanza for cluster config like master and metrics URLs
Add new stanza for extensions config
Remove obsolete extension properties
Rename script and stylesheet properties since they're now URLs
Add inactivityTimeoutMinutes option

/assign @deads2k
/cc @liggitt @jwforres

spadgett · 2018-01-12T13:33:48Z

I have not added config for ClusterResourceOverrides yet

deads2k · 2018-01-12T13:43:42Z

@spadgett something is red. For ease of review can you split the manual changes from the generated ones?

deads2k · 2018-01-12T13:46:32Z

webconsole/v1/types.go


 	// LogoutURL is an optional, absolute URL to redirect web browsers to after logging out of the web console.
 	// If not specified, the built-in logout page is shown.
-	LogoutURL string `json:"logoutURL" protobuf:"bytes,3,opt,name=logoutURL"`
+	LogoutURL string `json:"logoutURL" protobuf:"bytes,2,opt,name=logoutURL"`


This and the inactivity look related to "authentication"

deads2k · 2018-01-12T13:46:59Z

webconsole/v1/types.go

+
+	// ClusterConfiguration holds information the web console needs to talk to the cluster such as master public URL
+	// and metrics public URL.
+	ClusterConfiguration []ClusterConfiguration `json:"clusterConfiguration" protobuf:"bytes,4,rep,name=clusterConfiguration"`


I thought the console only handled one cluster.

deads2k · 2018-01-12T13:47:12Z

webconsole/v1/types.go

-	// PublicURL is where you can find the asset server (TODO do we really need this?)
-	PublicURL string `json:"publicURL" protobuf:"bytes,2,opt,name=publicURL"`
+	// PublicURL is where you can find the web console server (TODO do we really need this?)
+	PublicURL string `json:"publicURL" protobuf:"bytes,1,opt,name=publicURL"`


under ClusterConfiguration?

deads2k · 2018-01-12T13:47:47Z

webconsole/v1/types.go

+
+// ClusterConfiguration holds information the web console needs to talk to the cluster such as master public URL and
+// metrics public URL.
+type ClusterConfiguration struct {


You're envisioning CRO under this?

deads2k · 2018-01-12T13:48:17Z

webconsole/v1/types.go

+type ExtensionsConfiguration struct {
+	// ExtensionScriptURLs are URLs to load as scripts when the Web Console loads. The URLs must be accessible from
+	// the browser.
+	ExtensionScriptURLs []string `json:"extensionScriptURLs" protobuf:"bytes,1,rep,name=extensionScriptURLs"`


Interesting. No need for a map anymore?

There's still extension properties, but the old extensions stanza from asset config is no longer supported

deads2k · 2018-01-12T13:49:10Z

webconsole/v1/types.go


+	// ServingInfo is the HTTP serving information for these assets
+	ServingInfo HTTPServingInfo `json:"servingInfo" protobuf:"bytes,5,opt,name=servingInfo"`


nit: top of struct.

spadgett · 2018-01-12T13:50:20Z

I need help fixing the travis error. make generate shows no changes. Could it be different version of protobuf?

deads2k · 2018-01-12T13:52:50Z

I need help fixing the travis error. make generate shows no changes. Could it be different version of protobuf?

Once we get hte types pinned down, I'll pull it and generate

spadgett · 2018-01-12T14:21:25Z

/hold

deads2k · 2018-01-12T15:29:36Z

webconsole/v1/types.go

+// metrics public URL
+type ClusterInfo struct {
+	// MasterPublicURL is how the web console can access the OpenShift v1 server
+	MasterPublicURL string `j4on:"masterPublicURL" protobuf:"bytes,1,opt,name=masterPublicURL"`


j4on?

@sttts is there a linter of a test we have that would catch stuff like this?

j4on is valid tag name, isn't it?

j4on is valid tag name, isn't it?

Valid tag name, but there should be a json tag for every external field that doesn't explicitly opt out.

deads2k · 2018-01-12T15:32:16Z

webconsole/v1/types.go

-	ExtensionScripts []string `json:"extensionScripts" protobuf:"bytes,7,rep,name=extensionScripts"`
+	// LogoutURL is an optional, absolute URL to redirect web browsers to after logging out of the web console.
+	// If not specified, the built-in logout page is shown.
+	LogoutURL string `json:"logoutURL" protobuf:"bytes,2,opt,name=logoutURL"`


LogoutPublicURL ?

spadgett · 2018-01-12T21:34:56Z

Updated

spadgett · 2018-01-12T21:35:08Z

/hold cancel

spadgett · 2018-01-12T21:48:03Z

/hold

some debate still on the CRO flag

spadgett · 2018-01-12T22:04:45Z

/hold cancel

@jwforres discussed more, and we think this is good for now. We can always revisit the CRO flags later before release since they have no install or cluster up impact.

deads2k · 2018-01-15T13:09:11Z

webconsole/v1/types.go

-	Extensions []AssetExtensionsConfig `json:"extensions" protobuf:"bytes,10,rep,name=extensions"`
+	// ClusterResourceOverridesEnabled indicates that the cluster is configured for overcommit and the web console
+	// should hide request and limit fields that will be overridden in its editors
+	ClusterResourceOverridesEnabled bool `json:"clusterResourceOverridesEnabled" protobuf:"varint,6,opt,name=clusterResourceOverridesEnabled"`


You don't need specific values?

deads2k · 2018-01-15T13:10:28Z

/lgtm

* Add new stanza for cluster config like master and metrics URLs * Add new stanza for extensions config * Remove obsolete extension properties * Rename script and stylesheet properties since they're now URLs * Add inactivityTimeoutMinutes option

spadgett · 2018-01-15T13:48:07Z

Removed the CRO flag until we know for sure what we want.

@deads2k

Automatic merge from submit-queue. Update cluster up for console config API changes Adopt API changes from openshift/api#31 For now, both the new and old config need to be written to avoid breaking cluster up until origin-web-console-server is updated. /assign @deads2k @jwforres FYI

Update OLM to use UID for OG Labels

openshift-ci-robot assigned deads2k Jan 12, 2018

openshift-ci-robot requested review from jwforres and liggitt January 12, 2018 13:33

openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 12, 2018

deads2k reviewed Jan 12, 2018

View reviewed changes

spadgett force-pushed the console-config branch 2 times, most recently from acdd6cc to b2a4397 Compare January 12, 2018 14:20

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 12, 2018

deads2k reviewed Jan 12, 2018

View reviewed changes

spadgett force-pushed the console-config branch 2 times, most recently from 42e798d to dc349a4 Compare January 12, 2018 21:31

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 12, 2018

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 12, 2018

spadgett force-pushed the console-config branch from dc349a4 to 480a6b8 Compare January 12, 2018 21:54

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 12, 2018

deads2k reviewed Jan 15, 2018

View reviewed changes

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 15, 2018

spadgett added 2 commits January 15, 2018 08:46

Update WebConsoleConfiguration

fae8f14

* Add new stanza for cluster config like master and metrics URLs * Add new stanza for extensions config * Remove obsolete extension properties * Rename script and stylesheet properties since they're now URLs * Add inactivityTimeoutMinutes option

make generate

9a402b6

spadgett force-pushed the console-config branch from 480a6b8 to 9a402b6 Compare January 15, 2018 13:47

deads2k merged commit 3477075 into openshift:master Jan 15, 2018

spadgett deleted the console-config branch January 15, 2018 15:05

This was referenced Jan 15, 2018

Update console config for API changes openshift/openshift-ansible#6730

Merged

Update cluster up for console config API changes openshift/origin#18114

Merged

Update web console config openshift/origin-web-console-server#20

Merged

openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/api that referenced this pull request Feb 1, 2021

Merge pull request openshift#31 from awgreene/og-labels

5b1f691

Update OLM to use UID for OG Labels

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update WebConsoleConfiguration #31

Update WebConsoleConfiguration #31

spadgett commented Jan 12, 2018 •

edited

Loading

spadgett commented Jan 12, 2018

deads2k commented Jan 12, 2018

deads2k Jan 12, 2018

deads2k Jan 12, 2018

deads2k Jan 12, 2018

deads2k Jan 12, 2018

spadgett Jan 12, 2018

deads2k Jan 12, 2018

spadgett Jan 12, 2018

deads2k Jan 12, 2018

spadgett commented Jan 12, 2018

deads2k commented Jan 12, 2018

spadgett commented Jan 12, 2018

deads2k Jan 12, 2018

deads2k Jan 12, 2018

sttts Jan 15, 2018

deads2k Jan 15, 2018

deads2k Jan 12, 2018

spadgett commented Jan 12, 2018

spadgett commented Jan 12, 2018

spadgett commented Jan 12, 2018

spadgett commented Jan 12, 2018

deads2k Jan 15, 2018

deads2k commented Jan 15, 2018

spadgett commented Jan 15, 2018


		// ServingInfo is the HTTP serving information for these assets
		ServingInfo HTTPServingInfo `json:"servingInfo" protobuf:"bytes,5,opt,name=servingInfo"`

Update WebConsoleConfiguration #31

Update WebConsoleConfiguration #31

Conversation

spadgett commented Jan 12, 2018 • edited Loading

spadgett commented Jan 12, 2018

deads2k commented Jan 12, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

spadgett commented Jan 12, 2018

deads2k commented Jan 12, 2018

spadgett commented Jan 12, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

spadgett commented Jan 12, 2018

spadgett commented Jan 12, 2018

spadgett commented Jan 12, 2018

spadgett commented Jan 12, 2018

Choose a reason for hiding this comment

deads2k commented Jan 15, 2018

spadgett commented Jan 15, 2018

spadgett commented Jan 12, 2018 •

edited

Loading