🐛 Make init and exec restore hooks as omitempty in restore hookSpec (v…

…mware-tanzu#2793) Signed-off-by: Ashish Amarnath <[email protected]>
georgettica · Jan 26, 2021 · d5eae3d · d5eae3d
1 parent 8727f9c
commit d5eae3d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/changelogs/unreleased/2793-ashish-amarnath b/changelogs/unreleased/2793-ashish-amarnath
@@ -0,0 +1,2 @@
+Make init and exec restore hooks as optional in restore hookSpec
+
diff --git a/config/crd/bases/velero.io_restores.yaml b/config/crd/bases/velero.io_restores.yaml
@@ -1466,9 +1466,6 @@ spec:
                                     to complete.
                                   type: string
                               type: object
-                          required:
-                          - exec
-                          - init
                           type: object
                         type: array
                     required:

diff --git a/config/crd/crds/crds.go b/config/crd/crds/crds.go
diff --git a/pkg/apis/velero/v1/restore.go b/pkg/apis/velero/v1/restore.go
@@ -135,10 +135,10 @@ type RestoreResourceHookSpec struct {
 // RestoreResourceHook defines a restore hook for a resource.
 type RestoreResourceHook struct {
 	// Exec defines an exec restore hook.
-	Exec *ExecRestoreHook `json:"exec"`
+	Exec *ExecRestoreHook `json:"exec,omitempty"`
 
 	// Init defines an init restore hook.
-	Init *InitRestoreHook `json:"init"`
+	Init *InitRestoreHook `json:"init,omitempty"`
 }
 
 // ExecRestoreHook is a hook that uses pod exec API to execute a command inside a container in a pod
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Make init and exec restore hooks as optional in restore hookSpec