change persistence API

Author: Peng Zhou

api/v1alpha1/common_types.go

@@ -21,10 +21,12 @@ type ContainerProbe struct {
 }
 
 // Storage is the inteface to add pvc and pv support in marklogic
-type Storage struct {
-	Size             string             `json:"size,omitempty"`
-	VolumeMount      VolumeMountWrapper `json:"volumeMount,omitempty"`
-	StorageClassName string             `json:"storageClassName,omitempty"`
+type Persistence struct {
+	Enabled          bool                                `json:"enabled,omitempty"`
+	Size             string                              `json:"size,omitempty"`
+	StorageClassName string                              `json:"storageClassName,omitempty"`
+	AccessModes      []corev1.PersistentVolumeAccessMode `json:"accessModes,omitempty"`
+	Annotations      map[string]string                   `json:"annotations,omitempty"`
 }
 
 type HugePages struct {

api/v1alpha1/marklogiccluster_types.go

@@ -42,7 +42,7 @@ type MarklogicClusterSpec struct {
 	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
 
 	Auth                          *AdminAuth                   `json:"auth,omitempty"`
-	Storage                       *Storage                     `json:"storage,omitempty"`
+	Persistence                   *Persistence                 `json:"persistence,omitempty"`
 	Resources                     *corev1.ResourceRequirements `json:"resources,omitempty"`
 	TerminationGracePeriodSeconds *int64                       `json:"terminationGracePeriodSeconds,omitempty"`
 	// +kubebuilder:validation:Enum=OnDelete;RollingUpdate
@@ -79,7 +79,7 @@ type MarklogicGroups struct {
 	Image                     string                            `json:"image,omitempty"`
 	ImagePullPolicy           string                            `json:"imagePullPolicy,omitempty"`
 	ImagePullSecrets          []corev1.LocalObjectReference     `json:"imagePullSecrets,omitempty"`
-	Storage                   *Storage                          `json:"storage,omitempty"`
+	Persistence               *Persistence                      `json:"persistence,omitempty"`
 	Service                   Service                           `json:"service,omitempty"`
 	Resources                 *corev1.ResourceRequirements      `json:"resources,omitempty"`
 	Affinity                  *corev1.Affinity                  `json:"affinity,omitempty"`

api/v1alpha1/marklogicgroup_types.go

@@ -41,7 +41,7 @@ type MarklogicGroupSpec struct {
 	ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
 
 	Auth                          *AdminAuth                   `json:"auth,omitempty"`
-	Storage                       *Storage                     `json:"storage,omitempty"`
+	Persistence                   *Persistence                 `json:"persistence,omitempty"`
 	Resources                     *corev1.ResourceRequirements `json:"resources,omitempty"`
 	TerminationGracePeriodSeconds *int64                       `json:"terminationGracePeriodSeconds,omitempty"`
 	// +kubebuilder:validation:Enum=OnDelete;RollingUpdate