Merge pull request #3405 from GabyCT/updatek8stable

backport: Fixes for k8s tests for stable-2.0

.ci/lib.sh

@@ -16,6 +16,7 @@ export kata_repo="github.com/kata-containers/kata-containers"
 export kata_repo_dir="${GOPATH}/src/${kata_repo}"
 export ghprbTargetBranch=${ghprbTargetBranch:-}
 export kata_default_branch="${kata_default_branch:-$ghprbTargetBranch}"
+export timeout="60s"
 
 # Name of systemd service for the throttler
 KATA_KSM_THROTTLER_JOB="kata-ksm-throttler"

integration/kubernetes/k8s-attach-handlers.bats

@@ -28,7 +28,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/test-lifecycle-events.yaml"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod $pod_name
 
 	# Check postStart message
 	display_message="cat /usr/share/message"

integration/kubernetes/k8s-copy-file.bats

@@ -31,7 +31,7 @@ setup() {
 	kubectl create -f "${pod_config}"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod $pod_name
 
 	# Create a file
 	echo "$content" > "$file_name"
@@ -57,7 +57,7 @@ setup() {
 	kubectl create -f "${pod_config}"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod $pod_name
 
 	kubectl logs "$pod_name" || true
 	kubectl describe pod "$pod_name" || true

integration/kubernetes/k8s-cpu-ns.bats

@@ -27,7 +27,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-cpu.yaml"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	retries="10"
 

integration/kubernetes/k8s-custom-dns.bats

@@ -20,7 +20,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-custom-dns.yaml"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod $pod_name
 
 	# Check dns config at /etc/resolv.conf
 	kubectl exec "$pod_name" -- cat "$file_name" | grep -q "nameserver 1.2.3.4"

integration/kubernetes/k8s-empty-dirs.bats

@@ -19,7 +19,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-empty-dir.yaml"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Check volume mounts
 	cmd="mount | grep cache"

integration/kubernetes/k8s-liveness-probes.bats

@@ -25,7 +25,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-liveness.yaml"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Check liveness probe returns a success code
 	kubectl describe pod "$pod_name" | grep -E "Liveness|#success=1"
@@ -43,7 +43,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-http-liveness.yaml"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Check liveness probe returns a success code
 	kubectl describe pod "$pod_name" | grep -E "Liveness|#success=1"
@@ -62,7 +62,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-tcp-liveness.yaml"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Check liveness probe returns a success code
 	kubectl describe pod "$pod_name" | grep -E "Liveness|#success=1"

integration/kubernetes/k8s-memory.bats

@@ -43,7 +43,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/test_within_memory.yaml"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	rm -f "${pod_config_dir}/test_within_memory.yaml"
 	kubectl delete pod "$pod_name"

integration/kubernetes/k8s-parallel.bats

@@ -30,7 +30,7 @@ setup() {
 	kubectl get jobs -l jobgroup=${job_name}
 
 	# Check the pods
-	kubectl wait --for=condition=Ready pod -l jobgroup=${job_name}
+	kubectl wait --for=condition=Ready --timeout=$timeout pod -l jobgroup=${job_name}
 
 	# Check output of the jobs
 	for i in $(kubectl get pods -l jobgroup=${job_name} -o name); do

integration/kubernetes/k8s-pid-ns.bats

@@ -22,7 +22,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/busybox-pod.yaml"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod $pod_name
 
 	# Check PID from first container
 	first_pid_container=$(kubectl exec $pod_name -c $first_container_name ps | grep "/pause")

integration/kubernetes/k8s-projected-volume.bats

@@ -33,7 +33,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-projected-volume.yaml"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Check that the projected sources exists
 	cmd="ls /projected-volume | grep username"

integration/kubernetes/k8s-security-context.bats

@@ -20,7 +20,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-security-context.yaml"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Check user
 	cmd="ps --user 1000 -f"

integration/kubernetes/k8s-shared-volume.bats

@@ -22,7 +22,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-shared-volume.yaml"
 
 	# Check pods
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod $pod_name
 
 	# Communicate containers
 	cmd="cat /tmp/pod-data"
@@ -38,7 +38,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/initContainer-shared-volume.yaml"
 
 	# Check pods
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod $pod_name
 
 	cmd='test $(cat /volume/initContainer) -lt $(cat /volume/container)'
 	kubectl exec "$pod_name" -c "$last_container" -- sh -c "$cmd"

integration/kubernetes/k8s-sysctls.bats

@@ -20,7 +20,7 @@ setup() {
 	kubectl apply -f "${pod_config_dir}/pod-sysctl.yaml"
 
 	# Check pod creation
-	kubectl wait --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod $pod_name
 
 	# Check sysctl configuration
 	cmd="cat /proc/sys/kernel/shm_rmid_forced"