Use strategicpatch.JSONMap to store PodOverride specs (#332)

Signed-off-by: Prasad Ghangal <prasad.ghangal@gmail.com>
kanisterio · Oct 4, 2019 · 9a684c7 · 9a684c7
1 parent 76aee05
commit 9a684c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/pkg/apis/cr/v1alpha1/types.go b/pkg/apis/cr/v1alpha1/types.go
@@ -22,7 +22,8 @@ which also has the apache 2.0 license.
 package v1alpha1
 
 import (
-	v1 "k8s.io/api/core/v1"
+	sp "k8s.io/apimachinery/pkg/util/strategicpatch"
+
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -101,7 +102,7 @@ type ActionSpec struct {
 	Profile *ObjectReference `json:"profile"`
 	// PodOverride is use to specify pod specs that will override the
 	// default pod specs
-	PodOverride v1.PodSpec `json:"podOverride,omitempty"`
+	PodOverride sp.JSONMap `json:"podOverride,omitempty"`
 	// Options will be used to specify additional values
 	// to be used in the Blueprint.
 	Options map[string]string `json:"options"`

diff --git a/pkg/param/param.go b/pkg/param/param.go
@@ -23,6 +23,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	sp "k8s.io/apimachinery/pkg/util/strategicpatch"
 	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
 
@@ -48,7 +49,7 @@ type TemplateParams struct {
 	Options     map[string]string
 	Object      map[string]interface{}
 	Phases      map[string]*Phase
-	PodOverride v1.PodSpec
+	PodOverride sp.JSONMap
 }
 
 // StatefulSetParams are params for stateful sets.