Issue 638: Adding support for customized containers and env to segmen…

…tstore pods (#639) * Issue 638: Adding support for customised containers and env to segmentstore pods Signed-off-by: anisha.kj <[email protected]> * Adding support for customised volumes in segment store Signed-off-by: anisha.kj <[email protected]> * Correcting the crds Signed-off-by: anisha.kj <[email protected]> * Removed debug statement Signed-off-by: anisha.kj <[email protected]> Signed-off-by: anisha.kj <[email protected]>
pravega · Sep 15, 2022 · 74333af · 74333af
1 parent 4d2f367
commit 74333af
Show file tree

Hide file tree

Showing 5 changed files with 2,912 additions and 2 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -115,6 +115,7 @@ jobs:
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer);source /root/.gvm/scripts/gvm;gvm install go1.17.8 --binary;gvm use go1.17.8 --default"
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl create -f https://raw.githubusercontent.com/metallb/metallb/v0.9.3/manifests/namespace.yaml"
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/v0.9.3/manifests/metallb.yaml"
+        ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl create -f /root/pravega-operator/config/crd/bases/pravega.pravega.io_pravegaclusters.yaml"
         SECRET_KEY=8KGh4MBddaYa5SGDP943bisJk6uGqT9mBBaHN8dR2eZfUcaVmyqPLxC6KfAl9VWi
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl create secret generic -n metallb-system memberlist --from-literal=secretkey=$SECRET_KEY"
         ssh -o StrictHostKeyChecking=no root@$CLUSTER_IP "kubectl create -f /root/pravega-operator/test/e2e/resources/external_access/"

diff --git a/api/v1beta1/pravega.go b/api/v1beta1/pravega.go
@@ -236,6 +236,9 @@ type PravegaSpec struct {
 	// that need to be configured into the ss pod as environmental variables
 	SegmentStoreEnvVars string `json:"segmentStoreEnvVars,omitempty"`
 
+	// Provides the list of env variables that can be passed to segmentStore pods.
+	SegmentStoreContainerEnv []v1.EnvVar `json:"segmentStoreContainerEnv,omitempty"`
+
 	// SegmentStoreSecret specifies whether or not any secret needs to be configured into the ss pod
 	// either as an environment variable or by mounting it to a volume
 	// +optional
@@ -330,6 +333,12 @@ type PravegaSpec struct {
 
 	// Tolerations for the SegmentStore pods.
 	SegmentStorePodTolerations []corev1.Toleration `json:"segmentStorePodTolerations,omitempty"`
+
+	// Containers defines to support multi containers
+	SegmentStoreContainers []v1.Container `json:"segmentStoreContainers,omitempty"`
+
+	// SegmentStoreAdditionalVolumes defines customised volumes to be used in SegmentStore pods
+	SegmentStoreAdditionalVolumes []v1.Volume `json:"segmentStoreAdditionalVolumes,omitempty"`
 }
 
 type Probes struct {