From cf17050170a4e3a0d90f5fcb150813059d9fd162 Mon Sep 17 00:00:00 2001 From: Jingfang Liu Date: Wed, 8 Aug 2018 13:39:01 -0700 Subject: [PATCH] Revert "Skip adding nameprefix to namespace" --- pkg/app/application_test.go | 4 ++-- pkg/transformers/prefixname.go | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkg/app/application_test.go b/pkg/app/application_test.go index 1de8fb304..555f38111 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", "", ""): resource.NewResourceFromMap( + resource.NewResIdWithPrefixNamespace(ns, "ns1", "foo-", ""): resource.NewResourceFromMap( map[string]interface{}{ "apiVersion": "v1", "kind": "Namespace", "metadata": map[string]interface{}{ - "name": "ns1", + "name": "foo-ns1", "labels": map[string]interface{}{ "app": "nginx", }, diff --git a/pkg/transformers/prefixname.go b/pkg/transformers/prefixname.go index 855c5a22e..4070fa095 100644 --- a/pkg/transformers/prefixname.go +++ b/pkg/transformers/prefixname.go @@ -46,9 +46,6 @@ var skipNamePrefixPathConfigs = []PathConfig{ { GroupVersionKind: &schema.GroupVersionKind{Kind: "CustomResourceDefinition"}, }, - { - GroupVersionKind: &schema.GroupVersionKind{Kind: "Namespace"}, - }, } // NewDefaultingNamePrefixTransformer construct a namePrefixTransformer with defaultNamePrefixPathConfigs.