From c451d74cfdbd83f4e7aa562aeaf87824217fa16e Mon Sep 17 00:00:00 2001
From: qiaozp <47812250+chivalryq@users.noreply.github.com>
Date: Tue, 7 Sep 2021 11:30:41 +0800
Subject: [PATCH] Fix: kustomize json patch trait definition (#2239)

---
 charts/vela-core/templates/addons/fluxcd.yaml       |  6 +++++-
 vela-templates/addons/auto-gen/fluxcd.yaml          |  6 +++++-
 .../addons/fluxcd/definitions/json-patch.yaml       | 13 +++++++++----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/charts/vela-core/templates/addons/fluxcd.yaml b/charts/vela-core/templates/addons/fluxcd.yaml
index 664fcafd8..29107368a 100644
--- a/charts/vela-core/templates/addons/fluxcd.yaml
+++ b/charts/vela-core/templates/addons/fluxcd.yaml
@@ -5985,7 +5985,11 @@ data:
                     template: "patch: {\n\tspec: {\n\t\tpatchesJson6902: parameter.patchesJson\n\t}\n}\n\nparameter:
                       {\n\t// +usage=A list of JSON6902 patch.\n\tpatchesJson: [...#jsonPatchItem]\n}\n\n//
                       +usage=Contains a JSON6902 patch\n#jsonPatchItem: {\n\ttarget: #selector\n\tpatch:
-                      {\n\t\top:     string\n\t\tpath:   string\n\t\tvalue?: string\n\t}\n}\n\n//
+                      [...{\n\t\t// +usage=operation to perform\n\t\top: string | \"add\"
+                      | \"remove\" | \"replace\" | \"move\" | \"copy\" | \"test\"\n\t\t//
+                      +usage=operate path e.g. /foo/bar\n\t\tpath: string\n\t\t// +usage=specify
+                      source path when op is copy/move\n\t\tfrom?:  string\n\t\t// +usage=specify
+                      opraation value when op is test/add/replace\n\t\tvalue?: string\n\t}]\n}\n\n//
                       +usage=Selector specifies a set of resources\n#selector: {\n\tgroup?:
                       \             string\n\tversion?:            string\n\tkind?:               string\n\tnamespace?:
                       \         string\n\tname?:               string\n\tannotationSelector?:
diff --git a/vela-templates/addons/auto-gen/fluxcd.yaml b/vela-templates/addons/auto-gen/fluxcd.yaml
index 548e5617c..f8be8970e 100644
--- a/vela-templates/addons/auto-gen/fluxcd.yaml
+++ b/vela-templates/addons/auto-gen/fluxcd.yaml
@@ -5982,7 +5982,11 @@ spec:
                 template: "patch: {\n\tspec: {\n\t\tpatchesJson6902: parameter.patchesJson\n\t}\n}\n\nparameter:
                   {\n\t// +usage=A list of JSON6902 patch.\n\tpatchesJson: [...#jsonPatchItem]\n}\n\n//
                   +usage=Contains a JSON6902 patch\n#jsonPatchItem: {\n\ttarget: #selector\n\tpatch:
-                  {\n\t\top:     string\n\t\tpath:   string\n\t\tvalue?: string\n\t}\n}\n\n//
+                  [...{\n\t\t// +usage=operation to perform\n\t\top: string | \"add\"
+                  | \"remove\" | \"replace\" | \"move\" | \"copy\" | \"test\"\n\t\t//
+                  +usage=operate path e.g. /foo/bar\n\t\tpath: string\n\t\t// +usage=specify
+                  source path when op is copy/move\n\t\tfrom?:  string\n\t\t// +usage=specify
+                  opraation value when op is test/add/replace\n\t\tvalue?: string\n\t}]\n}\n\n//
                   +usage=Selector specifies a set of resources\n#selector: {\n\tgroup?:
                   \             string\n\tversion?:            string\n\tkind?:               string\n\tnamespace?:
                   \         string\n\tname?:               string\n\tannotationSelector?:
diff --git a/vela-templates/addons/fluxcd/definitions/json-patch.yaml b/vela-templates/addons/fluxcd/definitions/json-patch.yaml
index 18c6c359a..f7ccd53bf 100644
--- a/vela-templates/addons/fluxcd/definitions/json-patch.yaml
+++ b/vela-templates/addons/fluxcd/definitions/json-patch.yaml
@@ -22,11 +22,16 @@ spec:
         // +usage=Contains a JSON6902 patch
         #jsonPatchItem: {
         	target: #selector
-        	patch: {
-        		op:     string
-        		path:   string
+        	patch: [...{
+        		// +usage=operation to perform
+        		op: string | "add" | "remove" | "replace" | "move" | "copy" | "test"
+        		// +usage=operate path e.g. /foo/bar
+        		path: string
+        		// +usage=specify source path when op is copy/move
+        		from?:  string
+        		// +usage=specify opraation value when op is test/add/replace
         		value?: string
-        	}
+        	}]
         }
 
         // +usage=Selector specifies a set of resources