Merge pull request #239 from Liujingfang1/namespace2

Skip adding nameprefix to namespace
kubernetes-sigs · Aug 8, 2018 · 3857a67 · 3857a67
2 parents e0a09f4 + 10665c6
commit 3857a67
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/app/application_test.go b/pkg/app/application_test.go
@@ -164,12 +164,12 @@ func TestResources1(t *testing.T) {
 					"DB_PASSWORD": base64.StdEncoding.EncodeToString([]byte("somepw")),
 				},
 			}).SetBehavior(resource.BehaviorCreate),
-		resource.NewResIdWithPrefixNamespace(ns, "ns1", "foo-", ""): resource.NewResourceFromMap(
+		resource.NewResIdWithPrefixNamespace(ns, "ns1", "", ""): resource.NewResourceFromMap(
 			map[string]interface{}{
 				"apiVersion": "v1",
 				"kind":       "Namespace",
 				"metadata": map[string]interface{}{
-					"name": "foo-ns1",
+					"name": "ns1",
 					"labels": map[string]interface{}{
 						"app": "nginx",
 					},

diff --git a/pkg/transformers/prefixname.go b/pkg/transformers/prefixname.go
@@ -46,6 +46,9 @@ var skipNamePrefixPathConfigs = []PathConfig{
 	{
 		GroupVersionKind: &schema.GroupVersionKind{Kind: "CustomResourceDefinition"},
 	},
+	{
+		GroupVersionKind: &schema.GroupVersionKind{Kind: "Namespace"},
+	},
 }
 
 // NewDefaultingNamePrefixTransformer construct a namePrefixTransformer with defaultNamePrefixPathConfigs.
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,9 @@ var skipNamePrefixPathConfigs = []PathConfig{ @@
     	{
     		GroupVersionKind: &schema.GroupVersionKind{Kind: "CustomResourceDefinition"},
     	},
+    	{
+    		GroupVersionKind: &schema.GroupVersionKind{Kind: "Namespace"},
+    	},
     }
     // NewDefaultingNamePrefixTransformer construct a namePrefixTransformer with defaultNamePrefixPathConfigs.
@@ Expand Down @@