mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-06-10 16:42:51 +00:00
3a01a63a01
- In ResMap, drop concept of internal Id to Resource map. The ResMap is now (just) a list, allowing only very particular edits. - Resources should now be maintained in the order loaded. A later PR can adjust tests to remove the internal legacy sorting, and confirm order-out is predictable from order-in. The PR would suppress the sort in tests, and reorder the output to make all tests pass again, and confirm that the new order matched depth-first input traversal. The FromMap fixture function was removed from all test inputs to establish a predictable input order. - Resources now have two 'Ids', OriginalId and CurrentId. The former is fixed as GVK-name-namespace at load time, the latter changes during transformations. The latter can be used to narrow name references when the former maps to multiple resources. We allow bases to be loaded more than once in a build (a diamond pattern), so the OriginalId is not unique across the resources set. The CurrentId is (and must be) unique, but is constantly mutating. Failing to make this distinction clear, and attempting to maintain a mapping from a single mutating Id to a resource was making the code too complex. - Drop prefix/suffix from ResId - the ResId is now immutable. A later PR can remove the distinction with ItemId. - This PR increases coverage of ResMap is since this is a large refactor. Higher level tests didn't need much change outside reordering of results at the resource level.
98 lines
2.1 KiB
Go
98 lines
2.1 KiB
Go
// Copyright 2019 The Kubernetes Authors.
|
|
// SPDX-License-Identifier: Apache-2.0
|
|
|
|
package resid
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"sigs.k8s.io/kustomize/pkg/gvk"
|
|
)
|
|
|
|
// ResId is an identifier of a k8s resource object.
|
|
type ResId struct {
|
|
// Gvk of the resource.
|
|
gvk.Gvk `json:",inline,omitempty" yaml:",inline,omitempty"`
|
|
|
|
// Name of the resource before transformation.
|
|
Name string `json:"name,omitempty" yaml:"name,omitempty"`
|
|
|
|
// Namespace the resource belongs to.
|
|
// An untransformed resource has no namespace.
|
|
// A fully transformed resource has the namespace
|
|
// from the top most overlay.
|
|
Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
|
|
}
|
|
|
|
// NewResIdWithNamespace creates new ResId
|
|
// in a given namespace.
|
|
func NewResIdWithNamespace(k gvk.Gvk, n, ns string) ResId {
|
|
return ResId{Gvk: k, Name: n, Namespace: ns}
|
|
}
|
|
|
|
// NewResId creates new ResId.
|
|
func NewResId(k gvk.Gvk, n string) ResId {
|
|
return ResId{Gvk: k, Name: n}
|
|
}
|
|
|
|
// NewResIdKindOnly creates a new ResId.
|
|
func NewResIdKindOnly(k string, n string) ResId {
|
|
return ResId{Gvk: gvk.FromKind(k), Name: n}
|
|
}
|
|
|
|
const (
|
|
noNamespace = "~X"
|
|
noName = "~N"
|
|
separator = "|"
|
|
)
|
|
|
|
// String of ResId based on GVK, name and prefix
|
|
func (id ResId) String() string {
|
|
ns := id.Namespace
|
|
if ns == "" {
|
|
ns = noNamespace
|
|
}
|
|
nm := id.Name
|
|
if nm == "" {
|
|
nm = noName
|
|
}
|
|
return strings.Join(
|
|
[]string{id.Gvk.String(), ns, nm}, separator)
|
|
}
|
|
|
|
func FromString(s string) ResId {
|
|
values := strings.Split(s, separator)
|
|
g := gvk.FromString(values[0])
|
|
|
|
ns := values[1]
|
|
if ns == noNamespace {
|
|
ns = ""
|
|
}
|
|
nm := values[2]
|
|
if nm == noName {
|
|
nm = ""
|
|
}
|
|
return ResId{
|
|
Gvk: g,
|
|
Namespace: ns,
|
|
Name: nm,
|
|
}
|
|
}
|
|
|
|
// GvknString of ResId based on GVK and name
|
|
func (id ResId) GvknString() string {
|
|
return id.Gvk.String() + separator + id.Name
|
|
}
|
|
|
|
// GvknEquals returns true if the other id matches
|
|
// Group/Version/Kind/name.
|
|
func (id ResId) GvknEquals(o ResId) bool {
|
|
return id.Name == o.Name && id.Gvk.Equals(o.Gvk)
|
|
}
|
|
|
|
// Equals returns true if the other id matches
|
|
// namespace/Group/Version/Kind/name.
|
|
func (id ResId) Equals(o ResId) bool {
|
|
return id.Namespace == o.Namespace && id.GvknEquals(o)
|
|
}
|