diff --git a/pkg/target/kusttarget_test.go b/pkg/target/kusttarget_test.go index 5cc432374..cb554fe3e 100644 --- a/pkg/target/kusttarget_test.go +++ b/pkg/target/kusttarget_test.go @@ -204,12 +204,12 @@ func TestResources1(t *testing.T) { "DB_PASSWORD": base64.StdEncoding.EncodeToString([]byte("somepw")), }, }).SetBehavior(ifc.BehaviorCreate), - resid.NewResIdWithPrefixNamespace(ns, "ns1", "", ""): rf.RF().FromMap( + resid.NewResIdWithPrefixNamespace(ns, "ns1", "foo-", ""): rf.RF().FromMap( 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 d02e9a4a9..7e3fae4df 100644 --- a/pkg/transformers/prefixname.go +++ b/pkg/transformers/prefixname.go @@ -19,6 +19,7 @@ package transformers import ( "errors" "fmt" + "log" "sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/resmap" @@ -39,9 +40,11 @@ var prefixFieldSpecsToSkip = []config.FieldSpec{ { Gvk: gvk.Gvk{Kind: "CustomResourceDefinition"}, }, - { - Gvk: gvk.Gvk{Kind: "Namespace"}, - }, +} + +// deprecateNamePrefixFieldSpec will be moved into prefixFieldSpecsToSkip in next release +var deprecateNamePrefixFieldSpec = config.FieldSpec{ + Gvk: gvk.Gvk{Kind: "Namespace"}, } // NewNamePrefixTransformer construct a namePrefixTransformer. @@ -74,6 +77,9 @@ func (o *namePrefixTransformer) Transform(m resmap.ResMap) error { } for id := range mf { + if id.Gvk().IsSelected(&deprecateNamePrefixFieldSpec.Gvk) { + log.Println("Adding nameprefix to Namespace resource will be deprecated in next release.") + } objMap := mf[id].Map() for _, path := range o.fieldSpecsToUse { if !id.Gvk().IsSelected(&path.Gvk) { diff --git a/pkg/transformers/prefixname_test.go b/pkg/transformers/prefixname_test.go index 8a3acec52..e384f604b 100644 --- a/pkg/transformers/prefixname_test.go +++ b/pkg/transformers/prefixname_test.go @@ -54,14 +54,6 @@ func TestPrefixNameRun(t *testing.T) { "name": "crd", }, }), - resid.NewResId(ns, "ns"): rf.FromMap( - map[string]interface{}{ - "apiVersion": "v1", - "kind": "Namespace", - "metadata": map[string]interface{}{ - "name": "ns", - }, - }), } expected := resmap.ResMap{ resid.NewResIdWithPrefix(cmap, "cm1", "someprefix-"): rf.FromMap( @@ -88,14 +80,6 @@ func TestPrefixNameRun(t *testing.T) { "name": "crd", }, }), - resid.NewResId(ns, "ns"): rf.FromMap( - map[string]interface{}{ - "apiVersion": "v1", - "kind": "Namespace", - "metadata": map[string]interface{}{ - "name": "ns", - }, - }), } npt, err := NewNamePrefixTransformer(