Skip adding nameprefix to namespace

This commit is contained in:
Jingfang Liu
2018-10-18 13:52:11 -07:00
parent 16add04ccf
commit 90d03b0afe
3 changed files with 21 additions and 11 deletions

View File

@@ -203,12 +203,12 @@ func TestResources1(t *testing.T) {
"DB_PASSWORD": base64.StdEncoding.EncodeToString([]byte("somepw")), "DB_PASSWORD": base64.StdEncoding.EncodeToString([]byte("somepw")),
}, },
}).SetBehavior(ifc.BehaviorCreate), }).SetBehavior(ifc.BehaviorCreate),
resid.NewResIdWithPrefixNamespace(ns, "ns1", "foo-", ""): rf.RF().FromMap( resid.NewResIdWithPrefixNamespace(ns, "ns1", "", ""): rf.RF().FromMap(
map[string]interface{}{ map[string]interface{}{
"apiVersion": "v1", "apiVersion": "v1",
"kind": "Namespace", "kind": "Namespace",
"metadata": map[string]interface{}{ "metadata": map[string]interface{}{
"name": "foo-ns1", "name": "ns1",
"labels": map[string]interface{}{ "labels": map[string]interface{}{
"app": "nginx", "app": "nginx",
}, },

View File

@@ -19,7 +19,6 @@ package transformers
import ( import (
"errors" "errors"
"fmt" "fmt"
"log"
"sigs.k8s.io/kustomize/pkg/gvk" "sigs.k8s.io/kustomize/pkg/gvk"
"sigs.k8s.io/kustomize/pkg/resmap" "sigs.k8s.io/kustomize/pkg/resmap"
@@ -40,11 +39,9 @@ var prefixFieldSpecsToSkip = []config.FieldSpec{
{ {
Gvk: gvk.Gvk{Kind: "CustomResourceDefinition"}, Gvk: gvk.Gvk{Kind: "CustomResourceDefinition"},
}, },
} {
// deprecateNamePrefixFieldSpec will be moved into prefixFieldSpecsToSkip in next release
var deprecateNamePrefixFieldSpec = config.FieldSpec{
Gvk: gvk.Gvk{Kind: "Namespace"}, Gvk: gvk.Gvk{Kind: "Namespace"},
},
} }
// NewNamePrefixTransformer construct a namePrefixTransformer. // NewNamePrefixTransformer construct a namePrefixTransformer.
@@ -77,9 +74,6 @@ func (o *namePrefixTransformer) Transform(m resmap.ResMap) error {
} }
for id := range mf { 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() objMap := mf[id].Map()
for _, path := range o.fieldSpecsToUse { for _, path := range o.fieldSpecsToUse {
if !id.Gvk().IsSelected(&path.Gvk) { if !id.Gvk().IsSelected(&path.Gvk) {

View File

@@ -54,6 +54,14 @@ func TestPrefixNameRun(t *testing.T) {
"name": "crd", "name": "crd",
}, },
}), }),
resid.NewResId(ns, "ns"): rf.FromMap(
map[string]interface{}{
"apiVersion": "v1",
"kind": "Namespace",
"metadata": map[string]interface{}{
"name": "ns",
},
}),
} }
expected := resmap.ResMap{ expected := resmap.ResMap{
resid.NewResIdWithPrefix(cmap, "cm1", "someprefix-"): rf.FromMap( resid.NewResIdWithPrefix(cmap, "cm1", "someprefix-"): rf.FromMap(
@@ -80,6 +88,14 @@ func TestPrefixNameRun(t *testing.T) {
"name": "crd", "name": "crd",
}, },
}), }),
resid.NewResId(ns, "ns"): rf.FromMap(
map[string]interface{}{
"apiVersion": "v1",
"kind": "Namespace",
"metadata": map[string]interface{}{
"name": "ns",
},
}),
} }
npt, err := NewNamePrefixTransformer( npt, err := NewNamePrefixTransformer(