ci(e2e): add run-id label to infra resources for cleanup

Signed-off-by: Anton Yachmenev <[email protected]>

Author: yachmenevas

.github/workflows/e2e-matrix.yml

@@ -79,14 +79,7 @@ jobs:
           version: "latest"
 
       - name: Setup d8
-        uses: werf/trdl/actions/[email protected]
-        with:
-          repo: d8
-          url: https://deckhouse.ru/downloads/deckhouse-cli-trdl/
-          root-version: 1
-          root-sha512: 343bd5f0d8811254e5f0b6fe292372a7b7eda08d276ff255229200f84e58a8151ab2729df3515cb11372dc3899c70df172a4e54c8a596a73d67ae790466a0491
-          group: 0
-          channel: stable
+        uses: ./.github/actions/install-d8
 
       - name: Install yq
         run: |
@@ -147,7 +140,7 @@ jobs:
     env:
       GO_VERSION: "1.24.6"
       TIMEOUT: 4h
-      RUN_ID: nightly-nested-e2e-${{ matrix.storage_name }}-${{ github.run_number }}
+      RUN_ID: ${{ needs.setup.outputs.run_id }}
     steps:
       - uses: actions/checkout@v4
 
@@ -167,15 +160,8 @@ jobs:
         with:
           version: "latest"
 
-      - name: Setup d8 CLI
-        uses: werf/trdl/actions/[email protected]
-        with:
-          repo: d8
-          url: https://deckhouse.ru/downloads/deckhouse-cli-trdl/
-          root-version: 1
-          root-sha512: 343bd5f0d8811254e5f0b6fe2923729df3515cb11372dc3899c70df172a4e54c8a596a73d67ae790466a0491
-          group: 0
-          channel: stable
+      - name: Setup d8
+        uses: ./.github/actions/install-d8
 
       - name: Install ginkgo
         working-directory: test/e2e
@@ -191,7 +177,7 @@ jobs:
         uses: actions/download-artifact@v4
         with:
           name: nested-run-${{ env.RUN_ID }}
-          path: ci/dvp-e2e/tmp/runs
+          path: .
 
       - name: Configure kubeconfig env
         run: |
@@ -203,20 +189,6 @@ jobs:
           fi
           echo "KUBECONFIG=$NESTED_KUBECONFIG" >> "$GITHUB_ENV"
 
-      - name: Wait for nested API server
-        run: |
-          set -euo pipefail
-          for i in $(seq 1 30); do
-            if kubectl --request-timeout=15s get nodes >/dev/null 2>&1; then
-              echo "[INFO] Nested cluster is reachable"
-              exit 0
-            fi
-            echo "[INFO] Waiting for nested API... ($i/30)"
-            sleep 10
-          done
-          echo "[ERR] Nested API server did not become ready in time" >&2
-          exit 1
-
       - name: Run E2E tests
         working-directory: test/e2e
         env:

ci/dvp-e2e/Taskfile.yaml

@@ -535,16 +535,21 @@ tasks:
         echo "[CLEANUP] Prefix='{{ .PREFIX }}'"
         ns_list=$(kubectl get ns -o json | jq -r --arg p '{{ .PREFIX }}' '.items[].metadata.name | select(startswith($p))')
         if [ -z "${ns_list}" ]; then
-          echo "[INFO] No namespaces to delete"; exit 0
+          echo "[INFO] No namespaces to delete"
+        else
+          for ns in $ns_list; do
+            echo "[CLEANUP] Deleting namespace $ns ..."
+            kubectl delete ns "$ns" --wait=false || true
+          done
+          echo "[CLEANUP] Waiting for namespaces to be deleted..."
+          for ns in $ns_list; do
+            kubectl wait --for=delete ns/"$ns" --timeout=600s || echo "[WARN] Namespace $ns was not fully deleted within timeout"
+          done
         fi
-        for ns in $ns_list; do
-          echo "[CLEANUP] Deleting namespace $ns ..."
-          kubectl delete ns "$ns" --wait=false || true
-        done
-        echo "[CLEANUP] Waiting for namespaces to be deleted..."
-        for ns in $ns_list; do
-          kubectl wait --for=delete ns/"$ns" --timeout=600s || echo "[WARN] Namespace $ns was not fully deleted within timeout"
-        done
+        # Cleanup cluster-scoped resources for this run-id (if any)
+        echo "[CLEANUP] Deleting cluster-scoped resources labeled with run-id='{{ .PREFIX }}'"
+        kubectl delete virtualmachineclass -l e2e.deckhouse.io/run-id='{{ .PREFIX }}' --ignore-not-found || true
+        kubectl delete clusterrolebinding -l e2e.deckhouse.io/run-id='{{ .PREFIX }}' --ignore-not-found || true
 
   # ------------------------------------------------------------
   # CI helpers: kubeconfig + registry

ci/dvp-e2e/charts/infra/templates/ingress.yaml

@@ -3,6 +3,8 @@ kind: Service
 metadata:
   name: dvp-over-dvp-443
   namespace: {{ .Values.namespace }}
+  labels:
+    e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
 spec:
   ports:
   - port: 443
@@ -20,6 +22,8 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/ssl-passthrough: "true"
     nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
+  labels:
+    e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
 spec:
   ingressClassName: nginx
   rules:

ci/dvp-e2e/charts/infra/templates/jump-host/deploy.yaml

@@ -4,6 +4,8 @@ kind: Deployment
 metadata:
   name: jump-host
   namespace: {{ .Values.namespace }}
+  labels:
+    e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
 spec:
   replicas: 1
   selector:
@@ -13,6 +15,7 @@ spec:
     metadata:
       labels:
         app: jump-host
+        e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
     spec:
       containers:
         - name: jump-host

ci/dvp-e2e/charts/infra/templates/jump-host/svc.yaml

@@ -4,6 +4,8 @@ kind: Service
 metadata:
   name: jump-host
   namespace: {{ .Values.namespace }}
+  labels:
+    e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
 spec:
   type: NodePort
   selector:

ci/dvp-e2e/charts/infra/templates/ns.yaml

@@ -4,3 +4,4 @@ metadata:
   name: {{ .Values.namespace }}
   labels:
     heritage: deckhouse
+    e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"

ci/dvp-e2e/charts/infra/templates/rbac/rbac.yaml

@@ -3,6 +3,8 @@ kind: ServiceAccount
 metadata:
   name: dkp-sa
   namespace: {{ .Values.namespace }}
+  labels:
+    e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
 ---
 apiVersion: v1
 kind: Secret
@@ -11,13 +13,17 @@ metadata:
   namespace: {{ .Values.namespace }}
   annotations:
     kubernetes.io/service-account.name: dkp-sa
+  labels:
+    e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
 type: kubernetes.io/service-account-token
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   name: dkp-sa-rb
   namespace: {{ .Values.namespace }}
+  labels:
+    e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
 subjects:
   - kind: ServiceAccount
     name: dkp-sa
@@ -31,6 +37,8 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: dkp-sa-cluster-admin-{{ .Values.namespace }}
+  labels:
+    e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
 subjects:
   - kind: ServiceAccount
     name: dkp-sa

ci/dvp-e2e/charts/infra/templates/vi.yaml

@@ -4,6 +4,8 @@ kind: VirtualImage
 metadata:
   name: image
   namespace: {{ .Values.namespace }}
+  labels:
+    e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
 spec:
   storage: ContainerRegistry
   dataSource:

ci/dvp-e2e/charts/infra/templates/vmc.yaml

@@ -2,6 +2,8 @@ apiVersion: virtualization.deckhouse.io/v1alpha2
 kind: VirtualMachineClass
 metadata:
   name: "{{ .Values.namespace }}-cpu"
+  labels:
+    e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
 spec:
   cpu:
     type: Discovery