Merge pull request #4399 from derekwaynecarr/update_cache_func

If an object has no namespace, do not add a leading slash

Merge pull request #4399 from derekwaynecarr/update_cache_func
e300d6c9 · Brendan Burns · 8b66b3f1 · 192e1861 · e300d6c9
Commit e300d6c9 authored Feb 12, 2015 by Brendan Burns
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

store.go pkg/client/cache/store.go +4 -1

No files found.
--- a/pkg/client/cache/store.go
+++ b/pkg/client/cache/store.go
@@ -57,7 +57,10 @@ func MetaNamespaceKeyFunc(obj interface{}) (string, error) {
 	if err != nil {
 		return "", fmt.Errorf("object has no meta: %v", err)
 	}
-	return meta.Namespace() + "/" + meta.Name(), nil
+	if len(meta.Namespace()) > 0 {
+		return meta.Namespace() + "/" + meta.Name(), nil
+	}
+	return meta.Name(), nil
 }

 type cache struct {