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

Web UI v1beta3 conversion #8304

Merged
merged 1 commit into from May 22, 2015
Merged

Conversation

bcbroussard
Copy link
Contributor

Foundation for v1beta3 api upgrade of web ui
cc/ @lavalamp @bgrant0607 @jackgr

@brendandburns
Copy link
Contributor

Hrm, there are lots of API level chances in switching. Have we validated that the javascript code can handle it?

@yllierop
Copy link
Contributor

@brendanburns I'm going to focus on the API level changes as well. We'll make sure the javascript code is modified as well. I apologize if that wasn't clearly communicated.

@bgrant0607
Copy link
Member

Yes, I pointed out some of the problems in another PR: #8302 (comment)

@jackgr
Copy link
Contributor

jackgr commented May 15, 2015

We'll also need to update the configuration collector.

@lavalamp
Copy link
Member

Yeah, I expect a bunch of js changes before this will work. (note if you tried it like this it probably worked fine because the bin data didn't get regenerated)

@bcbroussard bcbroussard force-pushed the web-ui-v1beta3 branch 2 times, most recently from 557e70a to 170f517 Compare May 20, 2015 22:33
@bcbroussard
Copy link
Contributor Author

I'm splitting this PR up into many smaller ones for easier review.

"resourceVersion": 166552,
"apiVersion": "v1beta1",
"apiVersion": "v1beta3",
Copy link
Member

Choose a reason for hiding this comment

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

As in the other PR, all of these examples are still using the v1beta1 schema. They need to be totally regenerated using v1beta3.

@bcbroussard
Copy link
Contributor Author

@bgrant0607 I generated new mock files and updated the code. I used on the conversion utility on the earlier commit, which apparently does not account for selfLink. Thanks for the comments.

@bcbroussard
Copy link
Contributor Author

All pages are updated and ready for review. Once these are all in I will do followup PR's removing the v1beta2 api, and also updating to the v1 api endpoint.

@dchen1107
Copy link
Member

ping one this one since a lot of prs depending on it.

@@ -205,7 +206,7 @@ app.controller('TabCtrl', [
.service('cAdvisorService', ["$http", "$q", "ENV", function($http, $q, ENV) {
var _baseUrl = function(minionIp) {
var minionPort = ENV['/']['cAdvisorPort'] || "8081";
var proxy = ENV['/']['cAdvisorProxy'] || "/api/v1beta2/proxy/nodes/";
var proxy = ENV['/']['cAdvisorProxy'] || "/api/v1beta3/proxy/nodes/";
Copy link
Member

Choose a reason for hiding this comment

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

Should it be /api/v1beta3/proxy/namespaces/default/nodes?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

/nodes isn't namespaced and /api/v1beta3/proxy/namespaces/default/nodes throws a 404, so leaving it as is

Update mocks to v1beta3
@bcbroussard
Copy link
Contributor Author

Thanks @caesarxuchao I've made the setNamespace change, PTAL

@caesarxuchao
Copy link
Member

Thanks, @bcbroussard. I'm not familiar with .js, so I just checked the v1beta3 syntax, LGTM.

@caesarxuchao caesarxuchao added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 21, 2015
dchen1107 added a commit that referenced this pull request May 22, 2015
@dchen1107 dchen1107 merged commit 9674956 into kubernetes:master May 22, 2015
@bcbroussard bcbroussard deleted the web-ui-v1beta3 branch May 28, 2015 00:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants