sync

hack/.ci/run-e2e-gke-release.sh

@@ -20,6 +20,12 @@ trap gather-artifacts-on-exit EXIT
 SO_NODECONFIG_PATH="${SO_NODECONFIG_PATH=${parent_dir}/manifests/cluster/nodeconfig.yaml}"
 export SO_NODECONFIG_PATH
 
+SO_SCYLLACLUSTER_STORAGECLASS_NAME="${SO_SCYLLACLUSTER_STORAGECLASS_NAME=}"
+export SO_SCYLLACLUSTER_STORAGECLASS_NAME
+if [[ -z "${SO_CSI_DRIVER_PATH+x}" || -n "${SO_CSI_DRIVER_PATH}" ]]; then
+  SO_SCYLLACLUSTER_STORAGECLASS_NAME="${SO_SCYLLACLUSTER_STORAGECLASS_NAME:-scylladb-local-xfs}"
+fi
+
 SCYLLA_OPERATOR_FEATURE_GATES="${SCYLLA_OPERATOR_FEATURE_GATES:-AllAlpha=true,AllBeta=true}"
 export SCYLLA_OPERATOR_FEATURE_GATES
 

hack/ci-deploy-release.sh

@@ -88,8 +88,9 @@ else
   echo "Skipping CSI driver creation"
 fi
 
-mkdir "${ARTIFACTS}/manager"
-cat > "${ARTIFACTS}/manager/kustomization.yaml" << EOF
+if [[ -n "${SO_SCYLLACLUSTER_STORAGECLASS_NAME+x}" ]]; then
+  mkdir "${ARTIFACTS}/manager"
+  cat > "${ARTIFACTS}/manager/kustomization.yaml" << EOF
 resources:
 - ${source_url}/${revision}/deploy/manager-prod.yaml
 patches:
@@ -101,9 +102,12 @@ patches:
   patch: |
     - op: replace
       path: /spec/datacenter/racks/0/storage/storageClassName
-      value: scylladb-local-xfs
+      value: "${SO_SCYLLACLUSTER_STORAGECLASS_NAME}"
 EOF
-kubectl kustomize "${ARTIFACTS}/manager" | kubectl_create -n=scylla-manager -f=-
+  kubectl kustomize "${ARTIFACTS}/manager" | kubectl_create -n=scylla-manager -f=-
+else
+  kubectl_create -n=scylla-manager -f="${source_url}/${revision}/deploy/manager-prod.yaml"
+fi
 
 kubectl -n=scylla-manager wait --timeout=5m --for='condition=Progressing=False' scyllaclusters.scylla.scylladb.com/scylla-manager-cluster
 kubectl -n=scylla-manager wait --timeout=5m --for='condition=Degraded=False' scyllaclusters.scylla.scylladb.com/scylla-manager-cluster