Skip to content

Commit 14c8ee7

Browse files
committed
ci(e2e): SDS — generate LVMVolumeGroup to match CRD: use spec.actualVGNameOnTheNode, spec.local.nodeName and blockDeviceSelector.matchExpressions (storage.deckhouse.io/device-path In [paths])
1 parent 649b3cf commit 14c8ee7

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

ci/dvp-e2e/Taskfile.yaml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -981,15 +981,21 @@ tasks:
981981
fi
982982
for node in $NODES; do
983983
[ -z "$node" ] && continue
984-
NODE="$node" yq eval -n "
985-
.apiVersion = \"storage.deckhouse.io/v1alpha1\" |
986-
.kind = \"LVMVolumeGroup\" |
987-
.metadata.name = \"data-\" + env(NODE) |
988-
.spec.type = \"Local\" |
984+
# Build matchExpressions for known device paths per docs (label key is storage.deckhouse.io/device-path)
985+
MATCH_EXPR=$(yq eval -n '
986+
.key = "storage.deckhouse.io/device-path" |
987+
.operator = "In" |
988+
.values = ["/dev/sdb","/dev/vdb","/dev/xvdb","/dev/sdc","/dev/vdc","/dev/xvdc","/dev/sdd","/dev/vdd","/dev/xvdd"]
989+
')
990+
NODE="$node" MATCH_EXPR="$MATCH_EXPR" yq eval -n '
991+
.apiVersion = "storage.deckhouse.io/v1alpha1" |
992+
.kind = "LVMVolumeGroup" |
993+
.metadata.name = "data-" + env(NODE) |
994+
.spec.type = "Local" |
989995
.spec.local.nodeName = env(NODE) |
990-
.spec.local.actualVGNameOnTheNode = \"data\" |
991-
.spec.blockDeviceSelector.devicePaths = [\"/dev/sdb\",\"/dev/vdb\",\"/dev/xvdb\",\"/dev/sdc\",\"/dev/vdc\",\"/dev/xvdc\",\"/dev/sdd\",\"/dev/vdd\",\"/dev/xvdd\"]
992-
" | KUBECONFIG={{ .NESTED_KUBECONFIG }} kubectl apply -f -
996+
.spec.actualVGNameOnTheNode = "data" |
997+
.spec.blockDeviceSelector.matchExpressions = [ env(MATCH_EXPR) ]
998+
' | KUBECONFIG={{ .NESTED_KUBECONFIG }} kubectl apply -f -
993999
done
9941000
echo "[SDS] Creating ReplicatedStoragePool 'data' from LVMVolumeGroups..."
9951001
LVGS=$(printf "%s\n" $NODES | sed 's/^/ - name: data-/')

0 commit comments

Comments
 (0)