Merge pull request #517 from fluxcd/kustomize-fix-selector

apis: Kustomize target selector must be a pointer
fluxcd · Mar 27, 2023 · e7086b2 · e7086b2
2 parents c01256c + 5ea22ed
commit e7086b2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/apis/kustomize/kustomize_types.go b/apis/kustomize/kustomize_types.go
@@ -89,11 +89,11 @@ type Patch struct {
 	// Patch contains an inline StrategicMerge patch or an inline JSON6902 patch with
 	// an array of operation objects.
 	// +required
-	Patch string `json:"patch,omitempty"`
+	Patch string `json:"patch"`
 
 	// Target points to the resources that the patch document should be applied to.
 	// +optional
-	Target Selector `json:"target,omitempty"`
+	Target *Selector `json:"target,omitempty"`
 }
 
 // JSON6902 is a JSON6902 operation object.

diff --git a/apis/kustomize/zz_generated.deepcopy.go b/apis/kustomize/zz_generated.deepcopy.go
diff --git a/kustomize/kustomize_generator.go b/kustomize/kustomize_generator.go
@@ -151,7 +151,7 @@ func (g *Generator) WriteFile(dirPath string, opts ...SavingOptions) (Action, er
 	for _, p := range patches {
 		kus.Patches = append(kus.Patches, kustypes.Patch{
 			Patch:  p.Patch,
-			Target: adaptSelector(&p.Target),
+			Target: adaptSelector(p.Target),
 		})
 	}