diff --git a/resource-managers/kubernetes/integration-tests/README.md b/resource-managers/kubernetes/integration-tests/README.md index 265962dab518..748664cf41b7 100644 --- a/resource-managers/kubernetes/integration-tests/README.md +++ b/resource-managers/kubernetes/integration-tests/README.md @@ -312,15 +312,15 @@ Volcano integration is experimental in Aapche Spark 3.3.0 and the test coverage ## Requirements - A minimum of 6 CPUs and 9G of memory is required to complete all Volcano test cases. -- Volcano v1.5.0. +- Volcano v1.5.1. ## Installation # x86_64 - kubectl apply -f https://raw.githubusercontent.com/volcano-sh/volcano/v1.5.0/installer/volcano-development.yaml + kubectl apply -f https://raw.githubusercontent.com/volcano-sh/volcano/v1.5.1/installer/volcano-development.yaml # arm64: - kubectl apply -f https://raw.githubusercontent.com/volcano-sh/volcano/v1.5.0/installer/volcano-development-arm64.yaml + kubectl apply -f https://raw.githubusercontent.com/volcano-sh/volcano/v1.5.1/installer/volcano-development-arm64.yaml ## Run tests @@ -338,3 +338,16 @@ You can also specify `volcano` tag to only run Volcano test: -Dtest.exclude.tags=minikube \ -Dspark.kubernetes.test.deployMode=docker-desktop \ 'kubernetes-integration-tests/test' + +## Cleanup Volcano + + # x86_64 + kubectl delete -f https://raw.githubusercontent.com/volcano-sh/volcano/v1.5.1/installer/volcano-development.yaml + + # arm64: + kubectl delete -f https://raw.githubusercontent.com/volcano-sh/volcano/v1.5.1/installer/volcano-development-arm64.yaml + + # Cleanup Volcano webhook + kubectl delete validatingwebhookconfigurations volcano-admission-service-jobs-validate volcano-admission-service-pods-validate volcano-admission-service-queues-validate + kubectl delete mutatingwebhookconfigurations volcano-admission-service-jobs-mutate volcano-admission-service-podgroups-mutate volcano-admission-service-pods-mutate volcano-admission-service-queues-mutate + diff --git a/resource-managers/kubernetes/integration-tests/src/test/resources/volcano/disable-queue.yml b/resource-managers/kubernetes/integration-tests/src/test/resources/volcano/disable-queue.yml index 909102d7c90c..d9f8c36471ec 100644 --- a/resource-managers/kubernetes/integration-tests/src/test/resources/volcano/disable-queue.yml +++ b/resource-managers/kubernetes/integration-tests/src/test/resources/volcano/disable-queue.yml @@ -19,6 +19,6 @@ kind: Queue metadata: name: queue spec: - weight: 0 + weight: 1 capability: - cpu: "1" + cpu: "0.001" diff --git a/resource-managers/kubernetes/integration-tests/src/test/resources/volcano/disable-queue0-enable-queue1.yml b/resource-managers/kubernetes/integration-tests/src/test/resources/volcano/disable-queue0-enable-queue1.yml index 2281e2e8226a..82e479478ccd 100644 --- a/resource-managers/kubernetes/integration-tests/src/test/resources/volcano/disable-queue0-enable-queue1.yml +++ b/resource-managers/kubernetes/integration-tests/src/test/resources/volcano/disable-queue0-enable-queue1.yml @@ -19,7 +19,9 @@ kind: Queue metadata: name: queue0 spec: - weight: 0 + weight: 1 + capability: + cpu: "0.001" --- apiVersion: scheduling.volcano.sh/v1beta1 kind: Queue