ci(e2e): SDS flow hardened — explicit ModuleConfigs in d8-system; correct readiness checks; CRD-compatible LVMVolumeGroup; restore jump-host; cleanup

Author: yachmenevas

ci/dvp-e2e/Taskfile.yaml

@@ -898,11 +898,12 @@ tasks:
       - |
         set -euo pipefail
         echo "[SDS] Step 1: Enabling sds-node-configurator..."
-        cat <<'EOF' | KUBECONFIG={{ .NESTED_KUBECONFIG }} kubectl apply --validate=false -f -
+        cat <<'EOF' | KUBECONFIG={{ .NESTED_KUBECONFIG }} kubectl -n d8-system apply --validate=false -f -
         apiVersion: deckhouse.io/v1alpha1
         kind: ModuleConfig
         metadata:
           name: sds-node-configurator
+          namespace: d8-system
         spec:
           enabled: true
           version: 1
@@ -914,7 +915,7 @@ tasks:
         set -euo pipefail
         echo "[SDS] Step 2: Waiting for sds-node-configurator to be Ready..."
         for i in $(seq 1 60); do
-          STATUS=$(KUBECONFIG={{ .NESTED_KUBECONFIG }} kubectl get module sds-node-configurator -o jsonpath='{.status.status}' 2>/dev/null || echo "")
+          STATUS=$(KUBECONFIG={{ .NESTED_KUBECONFIG }} kubectl get module sds-node-configurator -o json | jq -r '.status.phase // .status.status // ""' 2>/dev/null || true)
           if [ "$STATUS" = "Ready" ]; then
             echo "[SDS] sds-node-configurator is Ready!"
             break
@@ -928,18 +929,21 @@ tasks:
       - |
         set -euo pipefail
         echo "[SDS] Step 3: Enabling sds-replicated-volume..."
-        yq eval -n '
-          .apiVersion = "deckhouse.io/v1alpha1" |
-          .kind = "ModuleConfig" |
-          .metadata.name = "sds-replicated-volume" |
-          .spec.enabled = true |
-          .spec.version = 1
-        ' | KUBECONFIG={{ .NESTED_KUBECONFIG }} kubectl apply --validate=false -f -
+        cat <<'EOF' | KUBECONFIG={{ .NESTED_KUBECONFIG }} kubectl -n d8-system apply --validate=false -f -
+        apiVersion: deckhouse.io/v1alpha1
+        kind: ModuleConfig
+        metadata:
+          name: sds-replicated-volume
+          namespace: d8-system
+        spec:
+          enabled: true
+          version: 1
+        EOF
       - |
         set -euo pipefail
         echo "[SDS] Step 4: Waiting for sds-replicated-volume to be Ready..."
         for i in $(seq 1 60); do
-          STATUS=$(KUBECONFIG={{ .NESTED_KUBECONFIG }} kubectl get module sds-replicated-volume -o jsonpath='{.status.status}' 2>/dev/null || echo "")
+          STATUS=$(KUBECONFIG={{ .NESTED_KUBECONFIG }} kubectl get module sds-replicated-volume -o json | jq -r '.status.phase // .status.status // ""' 2>/dev/null || true)
           if [ "$STATUS" = "Ready" ]; then
             echo "[SDS] sds-replicated-volume is Ready!"
             break
@@ -979,15 +983,21 @@ tasks:
         fi
         for node in $NODES; do
           [ -z "$node" ] && continue
-          NODE="$node" yq eval -n "
-            .apiVersion = \"storage.deckhouse.io/v1alpha1\" |
-            .kind = \"LVMVolumeGroup\" |
-            .metadata.name = \"data-\" + env(NODE) |
-            .spec.type = \"Local\" |
+          # Build matchExpressions for known device paths per docs (label key is storage.deckhouse.io/device-path)
+          MATCH_EXPR=$(yq eval -n '
+            .key = "storage.deckhouse.io/device-path" |
+            .operator = "In" |
+            .values = ["/dev/sdb","/dev/vdb","/dev/xvdb","/dev/sdc","/dev/vdc","/dev/xvdc","/dev/sdd","/dev/vdd","/dev/xvdd"]
+          ')
+          NODE="$node" MATCH_EXPR="$MATCH_EXPR" yq eval -n '
+            .apiVersion = "storage.deckhouse.io/v1alpha1" |
+            .kind = "LVMVolumeGroup" |
+            .metadata.name = "data-" + env(NODE) |
+            .spec.type = "Local" |
             .spec.local.nodeName = env(NODE) |
-            .spec.local.actualVGNameOnTheNode = \"data\" |
-            .spec.blockDeviceSelector.devicePaths = [\"/dev/sdb\",\"/dev/vdb\",\"/dev/xvdb\",\"/dev/sdc\",\"/dev/vdc\",\"/dev/xvdc\",\"/dev/sdd\",\"/dev/vdd\",\"/dev/xvdd\"]
-          " | KUBECONFIG={{ .NESTED_KUBECONFIG }} kubectl apply -f -
+            .spec.actualVGNameOnTheNode = "data" |
+            .spec.blockDeviceSelector.matchExpressions = [ env(MATCH_EXPR) ]
+          ' | KUBECONFIG={{ .NESTED_KUBECONFIG }} kubectl apply -f -
         done
         echo "[SDS] Creating ReplicatedStoragePool 'data' from LVMVolumeGroups..."
         LVGS=$(printf "%s\n" $NODES | sed 's/^/      - name: data-/')