Merge pull request #2794 from etefera/replace-patches-name

Replace patchesJson6902 field with patches.

api/types/fix.go

@@ -9,14 +9,14 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-// FixKustomizationPreUnmarshalling modies the raw data
+// FixKustomizationPreUnmarshalling modifies the raw data
 // before marshalling - e.g. changes old field names to
 // new field names.
 func FixKustomizationPreUnmarshalling(data []byte) ([]byte, error) {
-	deprecateFieldsMap := map[string]string{
+	deprecatedFieldsMap := map[string]string{
 		"imageTags:": "images:",
 	}
-	for oldname, newname := range deprecateFieldsMap {
+	for oldname, newname := range deprecatedFieldsMap {
 		pattern := regexp.MustCompile(oldname)
 		data = pattern.ReplaceAll(data, []byte(newname))
 	}

api/types/kustomization.go

@@ -144,6 +144,7 @@ type Kustomization struct {
 // moving content of deprecated fields to newer
 // fields.
 func (k *Kustomization) FixKustomizationPostUnmarshalling() {
+
 	if k.Kind == "" {
 		k.Kind = KustomizationKind
 	}
@@ -158,6 +159,17 @@ func (k *Kustomization) FixKustomizationPostUnmarshalling() {
 	k.Bases = nil
 }
 
+// FixKustomizationPreMarshalling fixes things
+// that should occur after the kustomization file
+// has been processed.
+func (k *Kustomization) FixKustomizationPreMarshalling() {
+	// PatchesJson6902 should be under the Patches field.
+	for _, patch := range k.PatchesJson6902 {
+		k.Patches = append(k.Patches, patch.ToPatch())
+	}
+	k.PatchesJson6902 = nil
+}
+
 func (k *Kustomization) EnforceFields() []string {
 	var errs []string
 	if k.Kind != "" && k.Kind != KustomizationKind && k.Kind != ComponentKind {

api/types/patchjson6902.go

@@ -19,3 +19,9 @@ type PatchJson6902 struct {
 	// inline patch string
 	Patch string `json:"patch,omitempty" yaml:"patch,omitempty"`
 }
+
+// ToPatch converts a PatchJson6902 to its superset Patch.
+func (patch *PatchJson6902) ToPatch() Patch {
+	selector := patch.Target.ToSelector()
+	return Patch{Path: patch.Path, Patch: patch.Patch, Target: &selector}
+}

api/types/patchtarget.go

@@ -13,3 +13,8 @@ type PatchTarget struct {
 	Namespace string `json:"namespace,omitempty" yaml:"namespace,omitempty"`
 	Name      string `json:"name" yaml:"name"`
 }
+
+// ToSelector converts a PatchTarget to a Selector.
+func (target *PatchTarget) ToSelector() Selector {
+	return Selector{Name: target.Name, Namespace: target.Namespace, Gvk: target.Gvk}
+}