Skip to content

Commit 2c100f6

Browse files
try fix cloud-init
Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>
1 parent 587a3ba commit 2c100f6

2 files changed

Lines changed: 8 additions & 45 deletions

File tree

.github/workflows/e2e-reusable-pipeline.yml

Lines changed: 6 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -494,51 +494,14 @@ jobs:
494494
fi
495495
- name: Enable SDN
496496
run: |
497+
echo "[INFO] Enable SDN"
497498
d8 system module enable sdn
498-
499-
d8_queue_list() {
500-
d8 s queue list | grep -Po '([0-9]+)(?= active)' || echo "[WARNING] Failed to retrieve list queue"
501-
}
502-
503-
d8_queue() {
504-
local count=90
505-
local queue_count
506-
507-
for i in $(seq 1 $count) ; do
508-
queue_count=$(d8_queue_list)
509-
if [ -n "$queue_count" ] && [ "$queue_count" = "0" ]; then
510-
echo "[SUCCESS] Queue is clear"
511-
return 0
512-
fi
513-
514-
echo "[INFO] Wait until queues are empty ${i}/${count}"
515-
if (( i % 5 == 0 )); then
516-
echo "[INFO] Show queue list"
517-
d8 s queue list | head -n25 || echo "[WARNING] Failed to retrieve list queue"
518-
echo " "
519-
fi
520-
521-
if (( i % 10 == 0 )); then
522-
echo "[INFO] deckhouse logs"
523-
echo "::group::📝 deckhouse logs"
524-
d8 s logs | tail -n 100
525-
echo "::endgroup::"
526-
echo " "
527-
fi
528-
sleep 10
529-
done
530-
}
531-
532-
echo "[INFO] Wait 30s for reconsilation start for module sdn"
533-
sleep 30
534-
d8_queue
535-
536-
echo "[INFO] Wait for sdn modules to be ready"
499+
echo "[INFO] Wait for sdn modules to be ready, timeout: 300s"
537500
kubectl wait --for=jsonpath='{.status.phase}'=Ready modules sdn --timeout=300s
538-
echo "[INFO] Wait for sdn deployments to be ready"
539-
kubectl -n d8-sdn wait --for=condition=Available deploy --all --timeout 900s
540-
echo "[INFO] Wait for sdn daemonset agent to be ready"
541-
kubectl -n d8-sdn rollout status daemonset agent --timeout=900s
501+
echo "[INFO] Wait for sdn deployments to be ready, timeout: 300s"
502+
kubectl -n d8-sdn wait --for=condition=Available deploy --all --timeout 300s
503+
echo "[INFO] Wait for sdn daemonset agent to be ready, timeout: 300s"
504+
kubectl -n d8-sdn rollout status daemonset agent --timeout=300s
542505
echo "[SUCCESS] Done"
543506
544507
- name: Configure ClusterNetwork

test/dvp-static-cluster/charts/infra/templates/_helpers.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ spec:
5858
version: 2
5959
ethernets:
6060
eno2:
61-
addresses: []
6261
dhcp4: false
6362
dhcp6: false
63+
addresses: []
64+
link-local: [ipv6]
6465
optional: false
65-
link-local: []
6666
packages:
6767
- qemu-guest-agent
6868
- jq

0 commit comments

Comments
 (0)