Skip to content

Commit a8a3d10

Browse files
authored
K8SPS-398: Replace assert with readiness check for chaos-daemon DaemonSet (#925)
1 parent ae67062 commit a8a3d10

File tree

3 files changed

+8
-28
lines changed

3 files changed

+8
-28
lines changed

e2e-tests/functions

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -780,14 +780,19 @@ deploy_chaos_mesh() {
780780

781781
helm repo add chaos-mesh https://charts.chaos-mesh.org
782782
if [ -n "${MINIKUBE}" ]; then
783-
helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=${NAMESPACE} --set chaosDaemon.runtime=docker --set dashboard.create=false --version ${CHAOS_MESH_VER}
783+
helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=${NAMESPACE} --set chaosDaemon.runtime=docker --set dashboard.create=false --version ${CHAOS_MESH_VER} --wait
784784
else
785-
helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=${NAMESPACE} --set chaosDaemon.runtime=containerd --set chaosDaemon.socketPath=/run/containerd/containerd.sock --set dashboard.create=false --version ${CHAOS_MESH_VER}
785+
helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=${NAMESPACE} --set chaosDaemon.runtime=containerd --set chaosDaemon.socketPath=/run/containerd/containerd.sock --set dashboard.create=false --version ${CHAOS_MESH_VER} --wait
786786
fi
787787
if [[ -n $OPENSHIFT ]]; then
788788
oc adm policy add-scc-to-user privileged -z chaos-daemon --namespace=${NAMESPACE}
789789
fi
790-
sleep 10
790+
791+
echo "Waiting for chaos-mesh DaemonSet to be ready..."
792+
until [ "$(kubectl get daemonset chaos-daemon -n ${NAMESPACE} -o jsonpath='{.status.numberReady}')" = "$(kubectl get daemonset chaos-daemon -n ${NAMESPACE} -o jsonpath='{.status.desiredNumberScheduled}')" ]; do
793+
echo "Waiting for DaemonSet chaos-daemon..."
794+
sleep 5
795+
done
791796
}
792797

793798
destroy_chaos_mesh() {

e2e-tests/tests/gr-self-healing/01-assert.yaml

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,3 @@ status:
1313
readyReplicas: 3
1414
replicas: 3
1515
updatedReplicas: 3
16-
---
17-
apiVersion: apps/v1
18-
kind: DaemonSet
19-
metadata:
20-
name: chaos-daemon
21-
status:
22-
currentNumberScheduled: 3
23-
desiredNumberScheduled: 3
24-
numberAvailable: 3
25-
numberMisscheduled: 0
26-
numberReady: 3
27-
observedGeneration: 1
28-
updatedNumberScheduled: 3

e2e-tests/tests/operator-self-healing/02-assert.yaml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,3 @@ status:
5959
state: ready
6060
state: ready
6161
---
62-
apiVersion: apps/v1
63-
kind: DaemonSet
64-
metadata:
65-
name: chaos-daemon
66-
status:
67-
currentNumberScheduled: 3
68-
desiredNumberScheduled: 3
69-
numberAvailable: 3
70-
numberMisscheduled: 0
71-
numberReady: 3
72-
observedGeneration: 1
73-
updatedNumberScheduled: 3

0 commit comments

Comments
 (0)