diff --git a/charts/descheduler/templates/tests/test-descheduler-pod.yaml b/charts/descheduler/templates/tests/test-descheduler-pod.yaml index 25772b3a2..9cae44200 100644 --- a/charts/descheduler/templates/tests/test-descheduler-pod.yaml +++ b/charts/descheduler/templates/tests/test-descheduler-pod.yaml @@ -17,7 +17,7 @@ spec: drop: - All privileged: false - runAsNonRoot: false + runAsNonRoot: false command: ["/bin/ash"] args: - -c @@ -26,4 +26,4 @@ spec: curl -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && chmod +x ./kubectl && mv ./kubectl /usr/local/bin/kubectl && - /usr/local/bin/kubectl get pods --namespace kube-system --token "$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" | grep "Completed" \ No newline at end of file + /usr/local/bin/kubectl get pods --namespace kube-system --token "$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)" | grep "descheduler" | grep "Completed" \ No newline at end of file diff --git a/docs/contributor-guide.md b/docs/contributor-guide.md index 87be4c182..c5ddda9f9 100644 --- a/docs/contributor-guide.md +++ b/docs/contributor-guide.md @@ -39,5 +39,18 @@ make test-unit make test-e2e ``` +## Run Helm Tests +Run the helm test for a particular descheduler release by setting below variables, +``` +HELM_IMAGE_REPO="descheduler" +HELM_IMAGE_TAG="helm-test" +HELM_CHART_LOCATION="./charts/descheduler" +``` +The helm tests runs as part of descheduler CI. But, to run it manually from the descheduler root, + +``` +make test-helm +``` + ### Miscellaneous See the [hack directory](https://github.com/kubernetes-sigs/descheduler/tree/master/hack) for additional tools and scripts used for developing the descheduler. diff --git a/test/run-helm-tests.sh b/test/run-helm-tests.sh index 965e03b97..a11dc5d8f 100755 --- a/test/run-helm-tests.sh +++ b/test/run-helm-tests.sh @@ -18,9 +18,9 @@ set -o nounset set -o pipefail K8S_VERSION=${KUBERNETES_VERSION:-v1.20.2} -HELM_IMAGE_REPO="descheduler" -HELM_IMAGE_TAG="helm-test" -CHARTS_PATH="./charts/descheduler" +IMAGE_REPO=${HELM_IMAGE_REPO:-descheduler} +IMAGE_TAG=${HELM_IMAGE_TAG:-helm-test} +CHART_LOCATION=${HELM_CHART_LOCATION:-./charts/descheduler} VERSION=helm-test make image wget https://github.com/kubernetes-sigs/kind/releases/download/v0.10.0/kind-linux-amd64 chmod +x kind-linux-amd64 @@ -28,7 +28,7 @@ mv kind-linux-amd64 kind export PATH=$PATH:$PWD kind create cluster --image kindest/node:"${K8S_VERSION}" --config=./hack/kind_config.yaml kind load docker-image descheduler:helm-test -helm install descheduler-ci --set image.repository="${HELM_IMAGE_REPO}",image.tag="${HELM_IMAGE_TAG}" --namespace kube-system "${CHARTS_PATH}" +helm install descheduler-ci --set image.repository="${IMAGE_REPO}",image.tag="${IMAGE_TAG}" --namespace kube-system "${CHART_LOCATION}" sleep 20s helm test descheduler-ci --namespace kube-system