ci(e2e): address PR review comments

- Add parent_storage_class to profiles.json for dynamic SC selection
- Use profile-based PARENT_STORAGE_CLASS instead of hardcoded ceph SC
- Simplify storageClasses config to single storageClass value
- Remove PROFILE override, use dynamic profile variable
- Update get_profile_config.sh to export PARENT_STORAGE_CLASS
- Remove unused second parameter from get_profile_config.sh
- Clarify environment/outputs export comment
- Use full profile name 'sds-replicated-volume' everywhere

Author: yachmenevas

.github/workflows/e2e-matrix.yml

@@ -18,7 +18,6 @@ on:
   push:
     branches:
       - chore/ci/e2e-matrix-skeleton
-      - ci-e2e-nested-sds
   pull_request:
     types: [opened, reopened, synchronize, labeled, unlabeled]
     branches:
@@ -160,8 +159,7 @@ jobs:
           RUN_ID="${{ needs.setup-nested-envs.outputs.run_id }}"
           echo "run_id=$RUN_ID" >> "$GITHUB_OUTPUT"
           echo "RUN_ID=$RUN_ID" >> "$GITHUB_ENV"
-          # Map sds-replicated-volume to sds for profile config
-          echo "PROFILE=sds" >> "$GITHUB_ENV"
+          echo "PROFILE=sds-replicated-volume" >> "$GITHUB_ENV"
           echo "TMP_ROOT=${{ env.TMP_ROOT }}" >> "$GITHUB_ENV"
           mkdir -p "${{ env.TMP_ROOT }}/shared" "${{ env.TMP_ROOT }}/matrix-logs"
 
@@ -218,7 +216,7 @@ jobs:
         working-directory: ci/dvp-e2e
         id: profile-config
         env:
-          PROFILE: sds
+          PROFILE: sds-replicated-volume
         run: |
           # Get storage class configuration from profiles.json
           PROFILE_CONFIG=$(./scripts/get_profile_config.sh "${PROFILE}")
@@ -227,25 +225,28 @@ jobs:
           STORAGE_CLASS=$(echo "$PROFILE_CONFIG" | grep "^STORAGE_CLASS=" | cut -d'=' -f2)
           IMAGE_STORAGE_CLASS=$(echo "$PROFILE_CONFIG" | grep "^IMAGE_STORAGE_CLASS=" | cut -d'=' -f2)
           SNAPSHOT_STORAGE_CLASS=$(echo "$PROFILE_CONFIG" | grep "^SNAPSHOT_STORAGE_CLASS=" | cut -d'=' -f2)
+          PARENT_STORAGE_CLASS=$(echo "$PROFILE_CONFIG" | grep "^PARENT_STORAGE_CLASS=" | cut -d'=' -f2)
           ATTACH_DISK_SIZE=$(echo "$PROFILE_CONFIG" | grep "^ATTACH_DISK_SIZE=" | cut -d'=' -f2)
 
           echo "Profile: ${PROFILE}"
           echo "Storage Class: ${STORAGE_CLASS}"
           echo "Image Storage Class: ${IMAGE_STORAGE_CLASS}"
           echo "Snapshot Storage Class: ${SNAPSHOT_STORAGE_CLASS}"
+          echo "Parent Storage Class: ${PARENT_STORAGE_CLASS}"
           echo "Attach Disk Size: ${ATTACH_DISK_SIZE}"
 
-          # Export variables safely
+          # Export variables to GitHub Actions environment and outputs
           echo "STORAGE_CLASS=${STORAGE_CLASS}" >> $GITHUB_ENV
           echo "IMAGE_STORAGE_CLASS=${IMAGE_STORAGE_CLASS}" >> $GITHUB_ENV
           echo "SNAPSHOT_STORAGE_CLASS=${SNAPSHOT_STORAGE_CLASS}" >> $GITHUB_ENV
+          echo "PARENT_STORAGE_CLASS=${PARENT_STORAGE_CLASS}" >> $GITHUB_ENV
           echo "ATTACH_DISK_SIZE=${ATTACH_DISK_SIZE}" >> $GITHUB_ENV
           echo "storage_class=$STORAGE_CLASS" >> $GITHUB_OUTPUT
           echo "image_storage_class=$IMAGE_STORAGE_CLASS" >> $GITHUB_OUTPUT
           echo "snapshot_storage_class=$SNAPSHOT_STORAGE_CLASS" >> $GITHUB_OUTPUT
           echo "attach_disk_size=$ATTACH_DISK_SIZE" >> $GITHUB_OUTPUT
           # Pass storage profile into run values for Helm templates
-          PROFILE='sds' yq eval --inplace '.storageProfile = strenv(PROFILE)' "${{ env.TMP_ROOT }}/runs/${{ env.RUN_ID }}/values.yaml"
+          yq eval --inplace ".storageProfile = \"${PROFILE}\"" "${{ env.TMP_ROOT }}/runs/${{ env.RUN_ID }}/values.yaml"
           # Effective disk SC used for worker data disks (prefer image SC when set)
           EFF_DISK_SC=${IMAGE_STORAGE_CLASS:-$STORAGE_CLASS}
           echo "EFFECTIVE_DISK_SC=${EFF_DISK_SC}" >> $GITHUB_ENV
@@ -267,13 +268,13 @@ jobs:
       - name: Bootstrap nested cluster (via jump-host)
         working-directory: ci/dvp-e2e
         run: |
-          echo "🚀 dhctl bootstrap (profile: sds-replicated-volume -> sds)"
+          echo "🚀 dhctl bootstrap (profile: sds-replicated-volume)"
           task dhctl-bootstrap \
             TMP_DIR="${{ env.TMP_ROOT }}/runs/${{ env.RUN_ID }}" \
             VALUES_FILE="${{ env.TMP_ROOT }}/runs/${{ env.RUN_ID }}/values.yaml" \
             PARENT_KUBECONFIG="${KUBECONFIG}" \
             SSH_FILE_NAME="id_ed" \
-            TARGET_STORAGE_CLASS="ceph-pool-r2-csi-rbd-immediate"
+            TARGET_STORAGE_CLASS="${{ env.PARENT_STORAGE_CLASS }}"
 
       - name: Attach data disks to worker VMs using hotplug
         working-directory: ci/dvp-e2e

ci/dvp-e2e/Taskfile.yaml

@@ -301,10 +301,10 @@ tasks:
             fi
 
             pvc_name=""
-            for j in $(seq 1 30); do
+            for j in $(seq 1 50); do
               pvc_name=$(kubectl -n {{ .NAMESPACE }} get vd "$vd" -o jsonpath='{.status.target.persistentVolumeClaimName}' 2>/dev/null || true)
               [ -n "$pvc_name" ] && break
-              echo "[INFRA] Waiting for PVC name for VD $vd; retry $j/30"; sleep 3
+              echo "[INFRA] Waiting for PVC name for VD $vd; retry $j/50"; sleep 3
             done
             if [ -n "$pvc_name" ]; then
               echo "[INFRA] Waiting PVC $pvc_name to reach phase=Bound..."
@@ -347,7 +347,7 @@ tasks:
 
             echo "[INFRA] Waiting for hotplug attachment of $vd..."
             success_by_vm=0
-            for i in $(seq 1 30); do
+            for i in $(seq 1 50); do
               phase=$(kubectl -n {{ .NAMESPACE }} get virtualmachineblockdeviceattachment "$vd" -o jsonpath='{.status.phase}' 2>/dev/null || true)
               if [ "$phase" = "Attached" ]; then
                 echo "[INFRA] Disk $vd successfully attached to VM $vm"; break
@@ -360,9 +360,9 @@ tasks:
           break
         fi
 
-              # Print status approximately every 30 seconds (poll interval is 5s)
-              if [ $((i % 6)) -eq 0 ]; then
-                echo "[INFRA] Disk $vd phase=$phase; retry $i/30"
+              # Print status approximately every 50 seconds (poll interval is 5s)
+              if [ $((i % 10)) -eq 0 ]; then
+                echo "[INFRA] Disk $vd phase=$phase; retry $i/50"
               fi
               sleep 5
 
@@ -468,10 +468,6 @@ tasks:
         if [ -n "{{ .TARGET_STORAGE_CLASS | default "" }}" ]; then
           export _SC='{{ .TARGET_STORAGE_CLASS }}'
           yq eval --inplace '.storageClass = env(_SC)' {{ .GENERATED_VALUES_FILE }}
-          yq eval --inplace '.storageClasses.controlPlane.root = env(_SC)' {{ .GENERATED_VALUES_FILE }}
-          yq eval --inplace '.storageClasses.controlPlane.etcd = env(_SC)' {{ .GENERATED_VALUES_FILE }}
-          yq eval --inplace '.storageClasses.workers.root = env(_SC)' {{ .GENERATED_VALUES_FILE }}
-          yq eval --inplace '.storageClasses.workers.data = env(_SC)' {{ .GENERATED_VALUES_FILE }}
         fi
       - |
         export SSH_PUB_KEY="$(cat {{ .SSH_PUB_KEY_FILE }})"
@@ -715,12 +711,12 @@ tasks:
       - |
         set -euo pipefail
         echo "[SDS] Waiting for API server to be ready..."
-        for i in $(seq 1 30); do
+        for i in $(seq 1 50); do
           if KUBECONFIG={{ .NESTED_KUBECONFIG }} kubectl get nodes >/dev/null 2>&1; then
             echo "[SDS] API server is ready!"
             break
           fi
-          echo "[SDS] API server not ready yet, retry $i/30"; sleep 10
+          echo "[SDS] API server not ready yet, retry $i/50"; sleep 10
         done
       - |
         set -euo pipefail

ci/dvp-e2e/charts/cluster-config/templates/cluster-config.yaml

@@ -36,13 +36,13 @@ masterNodeGroup:
       virtualMachineClassName: "{{ .Values.namespace }}-cpu"
     rootDisk:
       size: 50Gi
-      storageClass: {{ .Values.storageClasses.controlPlane.root }}
+      storageClass: {{ .Values.storageClass }}
       image:
         kind: VirtualImage
         name: image
     etcdDisk:
       size: 15Gi
-      storageClass: {{ .Values.storageClasses.controlPlane.etcd }}
+      storageClass: {{ .Values.storageClass }}
 provider:
   kubeconfigDataBase64: {{ .Values.kubeconfigDataBase64 }}
   namespace: {{ .Values.namespace }}

ci/dvp-e2e/charts/cluster-config/templates/nodegroups.yaml

@@ -15,7 +15,7 @@ spec:
     bootloader: {{ $.Values.image.bootloader }}
   rootDisk:
     size: 50Gi
-    storageClass: {{ $.Values.storageClasses.workers.root }}
+    storageClass: {{ $.Values.storageClass }}
     image:
       kind: VirtualImage
       name: image

ci/dvp-e2e/charts/cluster-config/values.yaml

@@ -37,13 +37,8 @@ ingressHosts:
   - console
   - virtualization
 
-# Storage classes configuration (for parent cluster)
-storageClasses:
-  controlPlane:
-    root: ceph-pool-r2-csi-rbd-immediate
-    etcd: ceph-pool-r2-csi-rbd-immediate
-  workers:
-    root: ceph-pool-r2-csi-rbd-immediate
+# Storage class for parent cluster VMs (overridden by workflow from profile)
+storageClass: ceph-pool-r2-csi-rbd-immediate
 
 # Feature flags (only those used by templates)
 features:

ci/dvp-e2e/profiles.json

@@ -1,9 +1,10 @@
 [
   {
-    "name": "sds",
+    "name": "sds-replicated-volume",
     "storage_class": "linstor-thin-r2",
     "image_storage_class": "linstor-thin-r1-immediate",
     "snapshot_storage_class": "linstor-thin-r2",
+    "parent_storage_class": "linstor-thin-r1-immediate",
     "worker_data_disk_size": "10Gi",
     "description": "SDS storage with LINSTOR thin provisioning"
   }

ci/dvp-e2e/scripts/get_profile_config.sh

@@ -20,10 +20,10 @@
 set -euo pipefail
 
 PROFILE="${1:-}"
-PROFILES_FILE="${2:-./profiles.json}"
+PROFILES_FILE="./profiles.json"
 
 if [[ -z "$PROFILE" ]]; then
-  echo "Usage: $0 <profile_name> [profiles_file]" >&2
+  echo "Usage: $0 <profile_name>" >&2
   exit 1
 fi
 
@@ -35,7 +35,7 @@ fi
 # Use jq to find profile by exact name only
 PROFILE_CONFIG=$(jq -r --arg profile "$PROFILE" '
   .[] | select(.name == $profile) |
-  "\(.storage_class)|\(.image_storage_class)|\(.snapshot_storage_class)|\(.worker_data_disk_size // "10Gi")"
+  "\(.storage_class)|\(.image_storage_class)|\(.snapshot_storage_class)|\(.parent_storage_class)|\(.worker_data_disk_size // "10Gi")"
 ' "$PROFILES_FILE")
 
 if [[ -z "$PROFILE_CONFIG" || "$PROFILE_CONFIG" == "null" ]]; then
@@ -46,9 +46,10 @@ if [[ -z "$PROFILE_CONFIG" || "$PROFILE_CONFIG" == "null" ]]; then
 fi
 
 # Split the result and export variables
-IFS='|' read -r SC IMG_SC SNAP_SC ATTACH_SIZE <<< "$PROFILE_CONFIG"
+IFS='|' read -r SC IMG_SC SNAP_SC PARENT_SC ATTACH_SIZE <<< "$PROFILE_CONFIG"
 
 echo "STORAGE_CLASS=$SC"
 echo "IMAGE_STORAGE_CLASS=$IMG_SC"
 echo "SNAPSHOT_STORAGE_CLASS=$SNAP_SC"
+echo "PARENT_STORAGE_CLASS=$PARENT_SC"
 echo "ATTACH_DISK_SIZE=$ATTACH_SIZE"