K8SPXC-1719: check containerd for chaos install

Author: eleo007

e2e-tests/functions

@@ -1383,10 +1383,40 @@ deploy_chaos_mesh() {
 
 	destroy_chaos_mesh
 
+	local current_runtime=$(kubectl get nodes -o jsonpath='{range .items[0]}{.status.nodeInfo.containerRuntimeVersion}{"\n"}{end}' | awk -F':' '{print $1}')
+
+	if [[ $current_runtime == 'containerd' ]]; then
+		container_runtime="containerd"
+		socket_path="/run/containerd/containerd.sock"
+	elif [[ $current_runtime == 'docker' ]]; then
+		container_runtime=docker
+		socket_path=/var/run/docker.sock
+	elif [[ $current_runtime == 'cri-o' ]]; then
+		container_runtime=crio
+		socket_path=/var/run/crio/crio.sock
+	else
+		echo "Unknown runtime: $current_runtime"
+		exit 1
+	fi
+
 	desc 'install chaos-mesh'
 	helm repo add chaos-mesh https://charts.chaos-mesh.org
-	helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=${chaos_mesh_ns} --set chaosDaemon.runtime=containerd --set chaosDaemon.socketPath=/run/containerd/containerd.sock --set dashboard.create=false --version $CHAOS_MESH_VER
-	sleep 10
+	helm install chaos-mesh chaos-mesh/chaos-mesh --namespace=${chaos_mesh_ns} --set chaosDaemon.runtime=$container_runtime --set chaosDaemon.socketPath=$socket_path --set dashboard.create=false --version ${CHAOS_MESH_VER}
+	if [ -n "${OPENSHIFT}" ]; then
+		oc adm policy add-scc-to-user privileged -z chaos-daemon --namespace=${chaos_mesh_ns}
+	fi
+
+	retry=0
+	until [ "$(kubectl get daemonset chaos-daemon -n ${chaos_mesh_ns} -o jsonpath='{.status.numberReady}')" = "$(kubectl get daemonset chaos-daemon -n ${chaos_mesh_ns} -o jsonpath='{.status.desiredNumberScheduled}')" ]; do
+		if [ $retry -ge 30 ]; then
+			echo "max retry count $retry reached. something went wrong with chaos-mesh install"
+			exit 1
+		fi
+		echo "Waiting for DaemonSet chaos-daemon..."
+		sleep 5
+		((retry += 1))
+	done
+
 }
 
 destroy_chaos_mesh() {

e2e-tests/operator-self-healing-chaos/run

@@ -116,18 +116,18 @@ main() {
 	desc 'create PXC cluster'
 	spinup_pxc "$cluster" "$test_dir/conf/$cluster.yml"
 
-	desc 'kill operator'
-	kill_pod
+	# desc 'kill operator'
+	# kill_pod
 
-	desc 'fail operator pod for 60s'
-	fail_pod
+	# desc 'fail operator pod for 60s'
+	# fail_pod
 
-	desc 'emulate bad network for 60s'
-	network_loss
+	# desc 'emulate bad network for 60s'
+	# network_loss
 
-	destroy_chaos_mesh
-	destroy $namespace
-	desc "test passed"
+	# destroy_chaos_mesh
+	# destroy $namespace
+	# desc "test passed"
 }
 
 main