Skip to content

Commit c183633

Browse files
yachmenevasyachmenevas
committed
ci(e2e): add run-id label to infra resources for cleanup
Signed-off-by: Anton Yachmenev <anton.yachmenev@flant.com>
1 parent f13b3d4 commit c183633

File tree

9 files changed

+44
-47
lines changed

9 files changed

+44
-47
lines changed

‎.github/workflows/e2e-matrix.yml‎

Lines changed: 6 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,7 @@ jobs:
7979
version: "latest"
8080

8181
- name: Setup d8
82-
uses: werf/trdl/actions/setup-app@v0.12.2
83-
with:
84-
repo: d8
85-
url: https://deckhouse.ru/downloads/deckhouse-cli-trdl/
86-
root-version: 1
87-
root-sha512: 343bd5f0d8811254e5f0b6fe292372a7b7eda08d276ff255229200f84e58a8151ab2729df3515cb11372dc3899c70df172a4e54c8a596a73d67ae790466a0491
88-
group: 0
89-
channel: stable
82+
uses: ./.github/actions/install-d8
9083

9184
- name: Install yq
9285
run: |
@@ -147,7 +140,7 @@ jobs:
147140
env:
148141
GO_VERSION: "1.24.6"
149142
TIMEOUT: 4h
150-
RUN_ID: nightly-nested-e2e-${{ matrix.storage_name }}-${{ github.run_number }}
143+
RUN_ID: ${{ needs.setup.outputs.run_id }}
151144
steps:
152145
- uses: actions/checkout@v4
153146

@@ -167,20 +160,13 @@ jobs:
167160
with:
168161
version: "latest"
169162

170-
- name: Setup d8 CLI
171-
uses: werf/trdl/actions/setup-app@v0.12.2
172-
with:
173-
repo: d8
174-
url: https://deckhouse.ru/downloads/deckhouse-cli-trdl/
175-
root-version: 1
176-
root-sha512: 343bd5f0d8811254e5f0b6fe2923729df3515cb11372dc3899c70df172a4e54c8a596a73d67ae790466a0491
177-
group: 0
178-
channel: stable
163+
- name: Setup d8
164+
uses: ./.github/actions/install-d8
179165

180166
- name: Install ginkgo
181167
working-directory: test/e2e
182168
run: |
183-
go install tool
169+
go install github.com/onsi/ginkgo/v2/ginkgo@latest
184170
185171
- name: Download dependencies
186172
working-directory: test/e2e
@@ -191,7 +177,7 @@ jobs:
191177
uses: actions/download-artifact@v4
192178
with:
193179
name: nested-run-${{ env.RUN_ID }}
194-
path: ci/dvp-e2e/tmp/runs
180+
path: .
195181

196182
- name: Configure kubeconfig env
197183
run: |
@@ -203,20 +189,6 @@ jobs:
203189
fi
204190
echo "KUBECONFIG=$NESTED_KUBECONFIG" >> "$GITHUB_ENV"
205191
206-
- name: Wait for nested API server
207-
run: |
208-
set -euo pipefail
209-
for i in $(seq 1 30); do
210-
if kubectl --request-timeout=15s get nodes >/dev/null 2>&1; then
211-
echo "[INFO] Nested cluster is reachable"
212-
exit 0
213-
fi
214-
echo "[INFO] Waiting for nested API... ($i/30)"
215-
sleep 10
216-
done
217-
echo "[ERR] Nested API server did not become ready in time" >&2
218-
exit 1
219-
220192
- name: Run E2E tests
221193
working-directory: test/e2e
222194
env:

‎ci/dvp-e2e/Taskfile.yaml‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ tasks:
127127
ATTACH_DISK_SIZE: "{{ .ATTACH_DISK_SIZE }}"
128128
EFFECTIVE_DISK_SC: "{{ .EFFECTIVE_DISK_SC }}"
129129
NAMESPACE: "{{ .RUN_ID }}"
130+
NESTED_DIR: "{{ .RUN_DIR }}/nested"
130131
NESTED_KUBECONFIG: "{{ .NESTED_KUBECONFIG_PATH }}"
131132
SDS_SC_NAME: "{{ .STORAGE_CLASS }}"
132133
DATA_DISK_COUNT: "{{ .DATA_DISK_COUNT }}"
@@ -481,10 +482,7 @@ tasks:
481482
set -euo pipefail
482483
NESTED_DIR="{{ .NESTED_DIR }}"
483484
NESTED_KUBECONFIG="{{ .NESTED_KUBECONFIG }}"
484-
if ! mkdir -p "${NESTED_DIR}"; then
485-
echo "[ERR] Failed to create nested directory: ${NESTED_DIR}" >&2
486-
exit 1
487-
fi
485+
mkdir -p "${NESTED_DIR}" "$(dirname "${NESTED_KUBECONFIG}")"
488486
- chmod +x scripts/build_nested_kubeconfig.sh
489487
- |
490488
scripts/build_nested_kubeconfig.sh \
@@ -535,16 +533,21 @@ tasks:
535533
echo "[CLEANUP] Prefix='{{ .PREFIX }}'"
536534
ns_list=$(kubectl get ns -o json | jq -r --arg p '{{ .PREFIX }}' '.items[].metadata.name | select(startswith($p))')
537535
if [ -z "${ns_list}" ]; then
538-
echo "[INFO] No namespaces to delete"; exit 0
536+
echo "[INFO] No namespaces to delete"
537+
else
538+
for ns in $ns_list; do
539+
echo "[CLEANUP] Deleting namespace $ns ..."
540+
kubectl delete ns "$ns" --wait=false || true
541+
done
542+
echo "[CLEANUP] Waiting for namespaces to be deleted..."
543+
for ns in $ns_list; do
544+
kubectl wait --for=delete ns/"$ns" --timeout=600s || echo "[WARN] Namespace $ns was not fully deleted within timeout"
545+
done
539546
fi
540-
for ns in $ns_list; do
541-
echo "[CLEANUP] Deleting namespace $ns ..."
542-
kubectl delete ns "$ns" --wait=false || true
543-
done
544-
echo "[CLEANUP] Waiting for namespaces to be deleted..."
545-
for ns in $ns_list; do
546-
kubectl wait --for=delete ns/"$ns" --timeout=600s || echo "[WARN] Namespace $ns was not fully deleted within timeout"
547-
done
547+
# Cleanup cluster-scoped resources for this run-id (if any)
548+
echo "[CLEANUP] Deleting cluster-scoped resources labeled with run-id='{{ .PREFIX }}'"
549+
kubectl delete virtualmachineclass -l e2e.deckhouse.io/run-id='{{ .PREFIX }}' --ignore-not-found || true
550+
kubectl delete clusterrolebinding -l e2e.deckhouse.io/run-id='{{ .PREFIX }}' --ignore-not-found || true
548551
549552
# ------------------------------------------------------------
550553
# CI helpers: kubeconfig + registry

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ kind: Service
33
metadata:
44
name: dvp-over-dvp-443
55
namespace: {{ .Values.namespace }}
6+
labels:
7+
e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
68
spec:
79
ports:
810
- port: 443
@@ -20,6 +22,8 @@ metadata:
2022
annotations:
2123
nginx.ingress.kubernetes.io/ssl-passthrough: "true"
2224
nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
25+
labels:
26+
e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
2327
spec:
2428
ingressClassName: nginx
2529
rules:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ kind: Deployment
44
metadata:
55
name: jump-host
66
namespace: {{ .Values.namespace }}
7+
labels:
8+
e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
79
spec:
810
replicas: 1
911
selector:
@@ -13,6 +15,7 @@ spec:
1315
metadata:
1416
labels:
1517
app: jump-host
18+
e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
1619
spec:
1720
containers:
1821
- name: jump-host

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ kind: Service
44
metadata:
55
name: jump-host
66
namespace: {{ .Values.namespace }}
7+
labels:
8+
e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
79
spec:
810
type: NodePort
911
selector:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ metadata:
44
name: {{ .Values.namespace }}
55
labels:
66
heritage: deckhouse
7+
e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ kind: ServiceAccount
33
metadata:
44
name: dkp-sa
55
namespace: {{ .Values.namespace }}
6+
labels:
7+
e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
68
---
79
apiVersion: v1
810
kind: Secret
@@ -11,13 +13,17 @@ metadata:
1113
namespace: {{ .Values.namespace }}
1214
annotations:
1315
kubernetes.io/service-account.name: dkp-sa
16+
labels:
17+
e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
1418
type: kubernetes.io/service-account-token
1519
---
1620
apiVersion: rbac.authorization.k8s.io/v1
1721
kind: RoleBinding
1822
metadata:
1923
name: dkp-sa-rb
2024
namespace: {{ .Values.namespace }}
25+
labels:
26+
e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
2127
subjects:
2228
- kind: ServiceAccount
2329
name: dkp-sa
@@ -31,6 +37,8 @@ apiVersion: rbac.authorization.k8s.io/v1
3137
kind: ClusterRoleBinding
3238
metadata:
3339
name: dkp-sa-cluster-admin-{{ .Values.namespace }}
40+
labels:
41+
e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
3442
subjects:
3543
- kind: ServiceAccount
3644
name: dkp-sa

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ kind: VirtualImage
44
metadata:
55
name: image
66
namespace: {{ .Values.namespace }}
7+
labels:
8+
e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
79
spec:
810
storage: ContainerRegistry
911
dataSource:

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ apiVersion: virtualization.deckhouse.io/v1alpha2
22
kind: VirtualMachineClass
33
metadata:
44
name: "{{ .Values.namespace }}-cpu"
5+
labels:
6+
e2e.deckhouse.io/run-id: "{{ .Values.namespace }}"
57
spec:
68
cpu:
79
type: Discovery

0 commit comments

Comments
 (0)