k8s: Put --timeout after --for on kubectl wait calls

This changed the calls to `kubectl wait` on the e2e tests so that --timeout=$timeout
is placed after the condition (--for) parameter.

Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

integration/kubernetes/k8s-block-volume.bats

@@ -47,7 +47,7 @@ setup() {
 	tmp_pod_yaml=$(mktemp --tmpdir pod-pv.XXXXX.yaml)
 	sed -e "s|DEVICE_PATH|${ctr_dev_path}|" "${pod_config_dir}/${pod_name}.yaml" > "$tmp_pod_yaml"
 	kubectl create -f "$tmp_pod_yaml"
-	kubectl wait --timeout=$timeout --for condition=ready "pod/${pod_name}"
+	kubectl wait --for condition=ready --timeout=$timeout "pod/${pod_name}"
 
 	# Verify persistent volume claim is bound
 	kubectl get "pvc/${volume_claim}" | grep "Bound"

integration/kubernetes/k8s-configmap.bats

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

integration/kubernetes/k8s-env.bats

@@ -19,7 +19,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-env.yaml"
 
 	# Check pod creation
-	kubectl wait --timeout=$timeout --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Print environment variables
 	cmd="printenv"

integration/kubernetes/k8s-expose-ip.bats

@@ -32,7 +32,7 @@ setup() {
 		kubectl create -f -
 
 	# Check deployment creation
-	cmd="kubectl wait --timeout=$timeout --for=condition=Available deployment/${deployment}"
+	cmd="kubectl wait --for=condition=Available --timeout=$timeout deployment/${deployment}"
 	waitForProcess "$wait_time" "$sleep_time" "$cmd"
 
 	# Check pods are running

integration/kubernetes/k8s-footloose.bats

@@ -43,7 +43,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-footloose.yaml"
 
 	# Check pod creation
-	kubectl wait --timeout=$timeout --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Get pod ip
 	pod_ip=$(kubectl get pod $pod_name --template={{.status.podIP}})

integration/kubernetes/k8s-hugepages.bats

@@ -26,7 +26,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-env.yaml"
 
 	# Check pod creation
-	kubectl wait --timeout=$timeout --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Print environment variables
 	cmd="printenv"
@@ -43,7 +43,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-env.yaml"
 
 	# Check pod creation
-	kubectl wait --timeout=$timeout --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Print environment variables
 	cmd="printenv"

integration/kubernetes/k8s-limit-range.bats

@@ -26,7 +26,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-cpu-defaults.yaml" --namespace=${namespace_name}
 
 	# Get pod specification
-	kubectl wait --timeout=$timeout --for=condition=Ready pod "$pod_name" --namespace="$namespace_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name" --namespace="$namespace_name"
 
 	# Check limits
 	# Find the 500 millicpus specified at the yaml

integration/kubernetes/k8s-oom.bats

@@ -20,7 +20,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-oom.yaml"
 
 	# Check pod creation
-	kubectl wait --timeout=$timeout --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Check if OOMKilled
 	cmd="kubectl get pods "$pod_name" -o yaml | yq r - 'status.containerStatuses[0].state.terminated.reason' | grep OOMKilled"

integration/kubernetes/k8s-port-forward.bats

@@ -24,12 +24,12 @@ setup() {
 	kubectl apply -f "${pod_config_dir}/redis-master-deployment.yaml"
 
 	# Check deployment
-	kubectl wait --timeout=$timeout --for=condition=Available deployment/"$deployment_name"
+	kubectl wait --for=condition=Available --timeout=$timeout deployment/"$deployment_name"
 	kubectl expose deployment/"$deployment_name"
 
 	# Get pod name
 	pod_name=$(kubectl get pods --output=jsonpath={.items..metadata.name})
-	kubectl wait --timeout=$timeout --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# View replicaset
 	kubectl get rs

integration/kubernetes/k8s-qos-pods.bats

@@ -26,7 +26,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-guaranteed.yaml"
 
 	# Check pod creation
-	kubectl wait --timeout=$timeout --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Check pod class
 	kubectl get pod "$pod_name" --output=yaml | grep "qosClass: Guaranteed"
@@ -41,7 +41,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-burstable.yam"l
 
 	# Check pod creation
-	kubectl wait --timeout=$timeout --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Check pod class
 	kubectl get pod "$pod_name" --output=yaml | grep "qosClass: Burstable"
@@ -55,7 +55,7 @@ setup() {
 	kubectl create -f "${pod_config_dir}/pod-besteffort.yam"l
 
 	# Check pod creation
-	kubectl wait --timeout=$timeout --for=condition=Ready pod "$pod_name"
+	kubectl wait --for=condition=Ready --timeout=$timeout pod "$pod_name"
 
 	# Check pod class
 	kubectl get pod "$pod_name" --output=yaml | grep "qosClass: BestEffort"

integration/kubernetes/k8s-replication.bats

@@ -32,7 +32,7 @@ setup() {
 
 	# Check pod creation
 	pod_name=$(kubectl get pods --output=jsonpath={.items..metadata.name})
-	cmd="kubectl wait --timeout=$timeout --for=condition=Ready pod $pod_name"
+	cmd="kubectl wait --for=condition=Ready --timeout=$timeout pod $pod_name"
 	waitForProcess "$wait_time" "$sleep_time" "$cmd"
 
 	# Check number of pods created for the