added option to use emptyDir as additional mount

opensearch-project · May 12, 2023 · 8f1459d · 8f1459d
1 parent 41ee305
commit 8f1459d
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 1 deletion.
diff --git a/charts/opensearch-operator/templates/opensearchclusters.opensearch.opster.io-crd.yaml b/charts/opensearch-operator/templates/opensearchclusters.opensearch.opster.io-crd.yaml
@@ -1008,6 +1008,16 @@ spec:
                   additionalVolumes:
                     items:
                       properties:
+                        emptyDir:
+                          description: emptyDir to use to populate the volume
+                          type: object
+                          properties:
+                            sizeLimit:
+                              description: Total amount of local storage required for this EmptyDir volume
+                              type: string
+                            medium:
+                              description: hat type of storage medium should back this directory
+                              type: string
                         configMap:
                           description: ConfigMap to use to populate the volume
                           properties:
@@ -2666,6 +2676,16 @@ spec:
                     description: Additional volumes to mount to all pods in the cluster
                     items:
                       properties:
+                        emptyDir:
+                          description: emptyDir to use to populate the volume
+                          properties:
+                            sizeLimit:
+                              description: Total amount of local storage required for this EmptyDir volume
+                              type: string
+                            medium:
+                              description: hat type of storage medium should back this directory
+                              type: string
+                          type: object
                         configMap:
                           description: ConfigMap to use to populate the volume
                           properties:

diff --git a/opensearch-operator/api/v1/opensearch_types.go b/opensearch-operator/api/v1/opensearch_types.go
@@ -234,6 +234,8 @@ type AdditionalVolume struct {
 	Secret *corev1.SecretVolumeSource `json:"secret,omitempty"`
 	// ConfigMap to use to populate the volume
 	ConfigMap *corev1.ConfigMapVolumeSource `json:"configMap,omitempty"`
+	// EmptyDir to use to populate the volume
+	EmptyDir *corev1.EmptyDirVolumeSource `json:"emptyDir,omitempty"`
 	// Whether to restart the pods on content change
 	RestartPods bool `json:"restartPods,omitempty"`
 }

diff --git a/opensearch-operator/api/v1/zz_generated.deepcopy.go b/opensearch-operator/api/v1/zz_generated.deepcopy.go
diff --git a/opensearch-operator/config/crd/bases/opensearch.opster.io_opensearchclusters.yaml b/opensearch-operator/config/crd/bases/opensearch.opster.io_opensearchclusters.yaml
@@ -1008,6 +1008,16 @@ spec:
                   additionalVolumes:
                     items:
                       properties:
+                        emptyDir:
+                          description: emptyDir to use to populate the volume
+                          type: object
+                          properties:
+                            sizeLimit:
+                              description: Total amount of local storage required for this EmptyDir volume
+                              type: string
+                            medium:
+                              description: hat type of storage medium should back this directory
+                              type: string
                         configMap:
                           description: ConfigMap to use to populate the volume
                           properties:
@@ -2666,6 +2676,16 @@ spec:
                     description: Additional volumes to mount to all pods in the cluster
                     items:
                       properties:
+                        emptyDir:
+                          description: emptyDir to use to populate the volume
+                          type: object
+                          properties:
+                            sizeLimit:
+                              description: Total amount of local storage required for this EmptyDir volume
+                              type: string
+                            medium:
+                              description: hat type of storage medium should back this directory
+                              type: string
                         configMap:
                           description: ConfigMap to use to populate the volume
                           properties:

diff --git a/opensearch-operator/pkg/reconcilers/util/util.go b/opensearch-operator/pkg/reconcilers/util/util.go
@@ -98,6 +98,7 @@ func CreateAdditionalVolumes(
 	namesIndex := map[string]int{}
 
 	for i, volumeConfig := range volumeConfigs {
+		readOnly := true
 		if volumeConfig.ConfigMap != nil {
 			retVolumes = append(retVolumes, corev1.Volume{
 				Name: volumeConfig.Name,
@@ -114,13 +115,22 @@ func CreateAdditionalVolumes(
 				},
 			})
 		}
+		if volumeConfig.EmptyDir != nil {
+			readOnly = false
+			retVolumes = append(retVolumes, corev1.Volume{
+				Name: volumeConfig.Name,
+				VolumeSource: corev1.VolumeSource{
+					EmptyDir: volumeConfig.EmptyDir,
+				},
+			})
+		}
 		if volumeConfig.RestartPods {
 			namesIndex[volumeConfig.Name] = i
 			names = append(names, volumeConfig.Name)
 		}
 		retVolumeMounts = append(retVolumeMounts, corev1.VolumeMount{
 			Name:      volumeConfig.Name,
-			ReadOnly:  true,
+			ReadOnly:  readOnly,
 			MountPath: volumeConfig.Path,
 		})
 	}