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

fabric8io · Oct 9, 2019 · eed0c10 · eed0c10
1 parent 6889a05
commit eed0c10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,11 +3,12 @@
 ### 4.6-SNAPSHOT
 #### Bugs
 * 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
-* Add support for filtering labels by EXISTS/NOT_EXISTS via the single argument versions of `.withLabel` and `.withoutLabel`
+* Add support for filtering labels by EXISTS/NOT-EXISTS via the single argument versions of `.withLabel` and `.withoutLabel`
 #### Dependency Upgrade
 * Updated Knative Serving to v0.9.90
 * Update Tekton to v0.7.0

diff --git a/.../main/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImpl.java b/.../main/java/io/fabric8/kubernetes/client/dsl/internal/RawCustomResourceOperationsImpl.java
@@ -406,7 +406,13 @@ private Map<String, Object> convertJsonStringToMap(String objectAsString) throws
   }
 
   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("/")