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.

Sign up for GitHub

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

Jump to bottom

Adding http:// prefix to the swagger WebServicesURL to prevent basePath validation errors #5342

Merged
merged 1 commit into from
Mar 12, 2015
Merged

Adding http:// prefix to the swagger WebServicesURL to prevent basePath validation errors #5342

merged 1 commit into from
Mar 12, 2015

Conversation

nikhiljindal
Copy link
Contributor

For fixing #4083

@googlebot
Copy link

Thanks for your pull request.

It looks like this may be your first contribution to a Google open source project, in which case you'll need to sign a Contributor License Agreement (CLA) at https://cla.developers.google.com/.

If you've already signed a CLA, it's possible we don't have your GitHub username or you're using a different email address. Check the information on your CLA or see this help article on setting the email on your git commits.

Once you've done that, please reply here to let us know. If you signed the CLA as a corporation, please let us know the company's name.

@vmarmol
Copy link
Contributor

vmarmol commented Mar 11, 2015

Looks like it needs a rebase btw

bgrant0607
bgrant0607 reviewed Mar 11, 2015
View reviewed changes
api/swagger-spec/api.json
@@ -1,7 +1,7 @@
{
"swaggerVersion": "1.2",
"apiVersion": "",
"basePath": "127.0.0.1:6443",
"basePath": "http://127.0.0.1:6443",
Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't this be https?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed as discussed.

@nikhiljindal nikhiljindal force-pushed the masterUrl branch 2 times, most recently from a8e599b to e2e2db3 Compare March 11, 2015 23:48
@nikhiljindal
Copy link
Contributor Author

Rebased.

@vmarmol
Copy link
Contributor

vmarmol commented Mar 12, 2015

LGTM, can wait for @bgrant0607 if you'd like.

@bgrant0607
Copy link
Member

LGTM.

Any idea why the swagger output changed so drastically?

@bgrant0607 bgrant0607 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 12, 2015
@nikhiljindal nikhiljindal mentioned this pull request Mar 12, 2015
Closed
@nikhiljindal
Copy link
Contributor Author

github is not allowing me to see the diffs in v1beta{1,2,3}.json.
The diff in resourceListing.json is just rearranging paths.
Maybe the diff in v1beta files is also just rearranging stuff.

We need to pull in
emicklei/go-restful@358e248 so that we stop seeing the spurious rearrange diffs.

@satnam6502
Copy link
Contributor

OK to merge?

@nikhiljindal
Copy link
Contributor Author

Yes. Ready to merge.

satnam6502 added a commit that referenced this pull request Mar 12, 2015
@satnam6502
Merge pull request #5342 from nikhiljindal/masterUrl
27c7756 
Adding http:// prefix to the swagger WebServicesURL to prevent basePath validation errors
@satnam6502 satnam6502 merged commit 27c7756 into kubernetes:master Mar 12, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@bgrant0607 bgrant0607

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@nikhiljindal @googlebot @vmarmol @bgrant0607 @satnam6502