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

Fix #1803: Missing "/" in request url while using customresource client #1804

Merged
merged 2 commits into from
Oct 14, 2019
Merged

Fix #1803: Missing "/" in request url while using customresource client #1804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c14a865
Fix #1803: Missing "/" in request url while using customresource client
rohanKanojia Oct 9, 2019
096bf31
Merge branch 'master' into pr/issue1803
rohanKanojia Oct 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@
#### Bugs
* Fix #1796: Check if BouncyCastle provider is set
* Fix #1724: createOrReplace function does not work properly for Custom defined resources
* Fix #1803: Missing "/" in request url while using customresource client
* Fix #1789: Create or replace on operation seems broken
* Fix #1782: Informer Deadlock; Fix lock typo in SharedProcessor

#### Improvements
* Fix #1797: Utils.waitUntilReady should record the stack trace of the caller before rethrowing an exception
* Add support for filtering labels by EXISTS/NOT_EXISTS via the single argument versions of `.withLabel` and `.withoutLabel`
* Schedule reconnect in case of HTTP_GONE when watching; the rescheduled connect will start from beginning of history by not specifying resourceVersion

#### Dependency Upgrade
* Updated Knative Serving to v0.9.90
* Update Tekton to v0.7.0
Expand Down
6 changes: 6 additions & 0 deletions .../main/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,13 @@ private String fetchUrl(String name, String namespace, Map<String, String> label
}

private String fetchUrl(String namespace, Map<String, String> labels) {
if (config.getMasterUrl() == null) {
return null;
}

StringBuilder urlBuilder = new StringBuilder(config.getMasterUrl());

urlBuilder.append(config.getMasterUrl().endsWith("/") ? "" : "/");
urlBuilder.append("apis/")
.append(customResourceDefinition.getGroup())
.append("/")
Expand Down