Merge pull request #240 from kubernetes-sigs/revert-239-namespace2

Revert "Skip adding nameprefix to namespace"
This commit is contained in:
Jingfang Liu
2018-08-08 13:41:38 -07:00
committed by GitHub
2 changed files with 2 additions and 5 deletions

View File

@@ -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",
},

View File

@@ -46,9 +46,6 @@ var skipNamePrefixPathConfigs = []PathConfig{
{
GroupVersionKind: &schema.GroupVersionKind{Kind: "CustomResourceDefinition"},
},
{
GroupVersionKind: &schema.GroupVersionKind{Kind: "Namespace"},
},
}
// NewDefaultingNamePrefixTransformer construct a namePrefixTransformer with defaultNamePrefixPathConfigs.