Merge pull request #5676 from surajssd/support-running-parallel-e2e

k8s-conformance: Add support to run tests in parallel

Author: GabyCT

integration/kubernetes/e2e_conformance/run.sh

@@ -27,14 +27,16 @@ RUNTIME="${RUNTIME:-containerd-shim-kata-v2}"
 CRI_RUNTIME="${CRI_RUNTIME:-containerd}"
 MINIMAL_K8S_E2E="${MINIMAL_K8S_E2E:-false}"
 KATA_HYPERVISOR="${KATA_HYPERVISOR:-}"
+RUNTIME_CLASS="${RUNTIME_CLASS:-kata}"
+E2E_PARALLEL="${E2E_PARALLEL:-false}"
 
 # Overall Sonobuoy timeout in minutes.
 WAIT_TIME=${WAIT_TIME:-180}
 
 JOBS_FILE="${SCRIPT_PATH}/e2e_k8s_jobs.yaml"
 
 create_kata_webhook() {
-	pushd "${SCRIPT_PATH}/../../../kata-webhook" >> /dev/null
+	pushd "${SCRIPT_PATH}/../../../kata-webhook" >>/dev/null
 	# Create certificates for the kata webhook
 	./create-certs.sh
 
@@ -46,6 +48,15 @@ create_kata_webhook() {
 	popd
 }
 
+delete_kata_webhook() {
+	pushd "${SCRIPT_PATH}/../../../kata-webhook" >>/dev/null
+
+	# Apply kata-webhook deployment
+	kubectl delete -f deploy/
+
+	popd
+}
+
 get_sonobuoy() {
 	sonobuoy_repo=$(get_test_version "externals.sonobuoy.url")
 	version=$(get_test_version "externals.sonobuoy.version")
@@ -84,12 +95,12 @@ run_sonobuoy() {
 	skip_options="Alpha|\[(Disruptive|Feature:[^\]]+|Flaky)\]"
 	local skip_list
 	skip_list=$(yaml_list_to_str_regex "\"${CRI_RUNTIME}\"" "${skipped_tests_file}")
-	if [ "${skip_list}" != "" ];then
+	if [ "${skip_list}" != "" ]; then
 		skip_options+="|${skip_list}"
 	fi
 
 	skip_list=$(yaml_list_to_str_regex "hypervisor.\"${KATA_HYPERVISOR}\"" "${skipped_tests_file}")
-	if [ "${skip_list}" != "" ];then
+	if [ "${skip_list}" != "" ]; then
 		skip_options+="|${skip_list}"
 	fi
 
@@ -111,6 +122,9 @@ run_sonobuoy() {
 			cmd+=" --e2e-skip=\"${skip_options}\""
 		fi
 	fi
+
+	cmd+=" --plugin-env e2e.E2E_PARALLEL=${E2E_PARALLEL}"
+
 	echo "running: ${cmd}"
 	eval "${cmd}"
 
@@ -140,18 +154,18 @@ run_sonobuoy() {
 		fi
 		local expected_passed_query="jobs.${CI_JOB:-}.passed"
 		local expected_passed=$("${GOPATH}/bin/yq" read "${JOBS_FILE}" "${expected_passed_query}")
-		if [ "${expected_passed}" != "" ];then
+		if [ "${expected_passed}" != "" ]; then
 			passed_query='.plugins | [ .[]."result-counts".passed] | add'
 			passed=$(sonobuoy status --json | jq "${passed_query}")
-			if [ "${expected_passed}" != "${passed}" ];then
+			if [ "${expected_passed}" != "${passed}" ]; then
 				die "expected ${expected_passed} tests to pass, but ${passed} passed"
 			else
 				info "All ${passed} tests passed as expected"
 			fi
 		else
 			info "Not found ${expected_passed_query} for job ${CI_JOB:-} in ${JOBS_FILE}"
 		fi
-	} |  tee "${e2e_result_dir}/summary"
+	} | tee "${e2e_result_dir}/summary"
 }
 
 cleanup() {
@@ -174,6 +188,10 @@ cleanup() {
 		fi
 	} || true
 
+	if [ "$RUNTIME" == "containerd-shim-kata-v2" ]; then
+		delete_kata_webhook
+	fi
+
 	# Revert the changes applied by the integration/kubernetes/init.sh
 	# script when it was called in our setup.sh.
 	info "Clean up the environment"

kata-webhook/README.md

@@ -1,6 +1,6 @@
 # Kata Admission controller webhook
 
-Implement a simple admission controller webhook to annotate pods with the 
+Implement a simple admission controller webhook to annotate pods with the
 Kata runtime class.
 
 ## How to build the admission controller
@@ -14,10 +14,10 @@ Kubernetes YAML files required to instantiate the admission
 controller.
 
 ```bash
-$ docker build -t quay.io/kata-containers/kata-webhook-example:latest -f Dockerfile .
+docker build -t quay.io/kata-containers/kata-webhook-example:latest -f Dockerfile .
 ```
 
-> **Note:**
+> **Note**
 > Image needs to be published for the webhook needs to work. Alternately
 > on a single machine cluster change the `imagePullPolicy` to use the locally
 > built image.
@@ -30,29 +30,31 @@ by default, except for workloads we know for sure will not work with Kata, use
 the [admission webhook](https://kubernetes.io/docs/reference/access-authn-authz/extensible-admission-controllers/#admission-webhooks)
 and sample admission controller we created by running the commands below:
 
-> **Note:**
+> **Note**
+>
 > By default, the `runtimeClass` name used in this webhook is `kata`. If your
 > cluster is configured with another `runtimeClass`, you'll need to change the
 > value of the `RUNTIME_CLASS` environment variable defined in the
-> [webhook file](deploy/webhook.yaml). You can manually edit the file or use
-> the `yq` tool. E.g:
-> `~/go/bin/yq w -i webhook.yaml spec.template.spec.containers[0].env[0].value "kata-clh"`
+> [webhook file](deploy/webhook.yaml). You can manually edit the file or run:
+>
+> `export RUNTIME_CLASS=<>`
+>
+> `kubectl create cm kata-webhook --from-literal runtime_class=$RUNTIME_CLASS`
 
 ```bash
-$ ./create_certs.sh
-$ kubectl apply -f deploy/
+./create-certs.sh
+kubectl apply -f deploy/
 ```
 
 Afterwards you can run the `webhook-check.sh` script to check the webhook was
 deployed correctly and is working:
 
 ```bash
-$ ./webhook-check.sh
+./webhook-check.sh
 ```
 
 The webhook mutates pods to use the Kata runtime class for all pods except
-those with 
+those with
 
-* `hostNetwork: true` 
+* `hostNetwork: true`
 * namespace: `rook-ceph` and `rook-ceph-system`
-

kata-webhook/main.go

@@ -54,6 +54,7 @@ func annotatePodMutator(_ context.Context, ar *kwhmodel.AdmissionReview, obj met
 
 	if pod.GetNamespace() == "sonobuoy" {
 		fmt.Println("sonobuoy pods will not be changed to kata", pod.GetNamespace(), pod.GetName())
+		return &kwhmutating.MutatorResult{}, nil
 	}
 
 	for i := range pod.Spec.Containers {

versions.yaml

@@ -72,7 +72,7 @@ externals:
   sonobuoy:
     description: "Tool to run kubernetes e2e conformance tests"
     url: "https://github.com/vmware-tanzu/sonobuoy"
-    version: "0.50.0"
+    version: "0.56.16"
 
 # This section contains versions used by the OpenShift CI jobs scripts.
 openshift-ci: