mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-06-12 01:14:22 +00:00
Change key used sort "not namespaceable objects.
- Use "%no_namespace% instead of "cluster-wide" - Ensure will be no conflict with a kubernetes valid namespace name.
This commit is contained in:
@@ -215,8 +215,9 @@ func writeIndividualFiles(
|
||||
|
||||
// Preserve backward compatibility with kustomize 2.1.0.
|
||||
// No need to cluter filename with namespace if all the objects
|
||||
// are in the same namespace.
|
||||
if (nsNeeded) && (namespace != "cluster-wide") {
|
||||
// are in the same namespace. The not namespaceable objects
|
||||
// are grouped in the "%no_namespace%" bucket.
|
||||
if (nsNeeded) && (namespace != "%no_namespace%") {
|
||||
basename = fmt.Sprintf(
|
||||
"%s_%s",
|
||||
strings.ToLower(namespace),
|
||||
|
||||
@@ -354,7 +354,8 @@ func (m *resWrangler) GetById(id resid.ResId) (*resource.Resource, error) {
|
||||
func (m *resWrangler) GroupedByNamespace() map[string][]*resource.Resource {
|
||||
byNamespace := make(map[string][]*resource.Resource)
|
||||
for _, res := range m.rList {
|
||||
namespace := "cluster-wide"
|
||||
// Add to the notNamespaceable bucket by default.
|
||||
namespace := "%no_namespace%"
|
||||
|
||||
if res.OrgId().IsNamespaceable() {
|
||||
namespace = res.OrgId().Namespace
|
||||
|
||||
Reference in New Issue
Block a user