From 10665c6fc9b2bb32124f8b44ec2cbc2046ef59b7 Mon Sep 17 00:00:00 2001 From: Jingfang Liu Date: Wed, 8 Aug 2018 10:02:42 -0700 Subject: [PATCH] Skip adding nameprefix to namespace --- pkg/app/application_test.go | 4 ++-- pkg/transformers/prefixname.go | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkg/app/application_test.go b/pkg/app/application_test.go index 555f38111..1de8fb304 100644 --- 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 index 4070fa095..855c5a22e 100644 --- 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.