Merge remote-tracking branch 'origin/KB-54' into dev

smpio · Dec 1, 2017 · 1f7c4a9 · 1f7c4a9
2 parents c9defdd + a3332c7
commit 1f7c4a9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kubernator",
-  "version": "0.14.7",
+  "version": "0.14.8",
   "private": true,
   "dependencies": {
     "@uqee/immutability-helper-x": "^0.2.1",

diff --git a/src/modules/k8s/items.js b/src/modules/k8s/items.js
@@ -236,11 +236,8 @@ function* sagaItemPost() {
       const resource = yield select(resourceSelectByKindAndVersion, kind, itemGetVersionByApiVersion(apiVersion));
       if (!resource) throw new Error('Can\'t find correponding resource by apiVersion and kind.');
 
-      // get url
-      const { namespaced, [URL]: resourceUrl } = resource;
-      const url = namespaced ? resourceGetUrl(resource, namespace) : resourceUrl;
-
       // post
+      const url = resourceGetUrl(resource, namespace || 'default');
       const item = yield call(itemApiPost, url, yaml);
       if (item.status === 'Failure') throw item;
 

diff --git a/src/modules/k8s/resources.js b/src/modules/k8s/resources.js
@@ -191,7 +191,7 @@ export function resourceDecorate(group, version) {
 }
 
 export function resourceGetUrl(resource, namespace) {
-  return namespace
+  return resource.namespaced && namespace
     ? `${resource[URL_PART_GROUP]}/namespaces/${namespace}/${resource[URL_PART_RESOURCE]}`
     : resource[URL];
 }