diff --git a/api/builtins/PrefixSuffixTransformer.go b/api/builtins/PrefixSuffixTransformer.go index 148c68a1a..09de319d8 100644 --- a/api/builtins/PrefixSuffixTransformer.go +++ b/api/builtins/PrefixSuffixTransformer.go @@ -26,6 +26,7 @@ type PrefixSuffixTransformerPlugin struct { var prefixSuffixFieldSpecsToSkip = types.FsSlice{ {Gvk: resid.Gvk{Kind: "CustomResourceDefinition"}}, {Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"}}, + {Gvk: resid.Gvk{Kind: "Namespace"}}, } func (p *PrefixSuffixTransformerPlugin) Config( diff --git a/api/internal/target/kusttarget_test.go b/api/internal/target/kusttarget_test.go index 134cac462..4b3e6ac32 100644 --- a/api/internal/target/kusttarget_test.go +++ b/api/internal/target/kusttarget_test.go @@ -187,7 +187,7 @@ metadata: "apiVersion": "v1", "kind": "Namespace", "metadata": map[string]interface{}{ - "name": "foo-ns1-bar", + "name": "ns1", "labels": map[string]interface{}{ "app": "nginx", }, diff --git a/api/krusty/baseandoverlaysmall_test.go b/api/krusty/baseandoverlaysmall_test.go index 5abed110d..d7e1fa3a0 100644 --- a/api/krusty/baseandoverlaysmall_test.go +++ b/api/krusty/baseandoverlaysmall_test.go @@ -70,7 +70,7 @@ metadata: apiVersion: v1 kind: Namespace metadata: - name: p-b-myNs + name: myNs --- apiVersion: v1 kind: Role @@ -95,7 +95,7 @@ metadata: apiVersion: v1 kind: Namespace metadata: - name: p-myNs2 + name: myNs2 `) } diff --git a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go index 356e6e14e..ec225a989 100644 --- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go +++ b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer.go @@ -30,6 +30,7 @@ var KustomizePlugin plugin var prefixSuffixFieldSpecsToSkip = types.FsSlice{ {Gvk: resid.Gvk{Kind: "CustomResourceDefinition"}}, {Gvk: resid.Gvk{Group: "apiregistration.k8s.io", Kind: "APIService"}}, + {Gvk: resid.Gvk{Kind: "Namespace"}}, } func (p *plugin) Config( diff --git a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go index 4dcf3521b..00c23d717 100644 --- a/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go +++ b/plugin/builtin/prefixsuffixtransformer/PrefixSuffixTransformer_test.go @@ -25,6 +25,11 @@ fieldSpecs: - path: metadata/name `, ` apiVersion: v1 +kind: Namespace +metadata: + name: apple +--- +apiVersion: v1 kind: Service metadata: name: apple @@ -50,6 +55,11 @@ metadata: th.AssertActualEqualsExpected(rm, ` apiVersion: v1 +kind: Namespace +metadata: + name: apple +--- +apiVersion: v1 kind: Service metadata: name: baked-apple-pie