From 92445b2e817adae93bc921445e8cbb7158bfeff6 Mon Sep 17 00:00:00 2001 From: TommyLike Date: Tue, 9 Apr 2019 10:42:22 +0800 Subject: [PATCH] Fix issue raised from previous MR --- README.md | 2 +- hack/run-e2e-kind.sh | 6 +++--- .../plugins/gen-admission-secret/gen-admission-secret.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2aa69e2589..21fd2cfc9e 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ build them locally with the command: ``` cd $GOPATH/src/volcano.sh/volcano -make docker +make images ## Verify your images # docker images diff --git a/hack/run-e2e-kind.sh b/hack/run-e2e-kind.sh index eaf721ba3e..c68467398c 100755 --- a/hack/run-e2e-kind.sh +++ b/hack/run-e2e-kind.sh @@ -57,9 +57,9 @@ function install-volcano { docker pull ${MPI_EXAMPLE_IMAGE} echo "Loading docker images into kind cluster" - kind load docker-image ${IMAGE}-controllers:${TAG} ${CLUSTER_CONTEXT} - kind load docker-image ${IMAGE}-scheduler:${TAG} ${CLUSTER_CONTEXT} - kind load docker-image ${IMAGE}-admission:${TAG} ${CLUSTER_CONTEXT} + kind load docker-image ${IMAGE_PREFIX}-controllers:${TAG} ${CLUSTER_CONTEXT} + kind load docker-image ${IMAGE_PREFIX}-scheduler:${TAG} ${CLUSTER_CONTEXT} + kind load docker-image ${IMAGE_PREFIX}-admission:${TAG} ${CLUSTER_CONTEXT} kind load docker-image ${MPI_EXAMPLE_IMAGE} ${CLUSTER_CONTEXT} echo "Install volcano plugin into cluster...." diff --git a/installer/chart/volcano/plugins/gen-admission-secret/gen-admission-secret.sh b/installer/chart/volcano/plugins/gen-admission-secret/gen-admission-secret.sh index ece804d5f6..da715a9dcf 100755 --- a/installer/chart/volcano/plugins/gen-admission-secret/gen-admission-secret.sh +++ b/installer/chart/volcano/plugins/gen-admission-secret/gen-admission-secret.sh @@ -116,7 +116,7 @@ for x in $(seq 15); do sleep 1 done if [[ ${serverCert} == '' ]]; then - echo "ERROR: After approving csr ${csrName}, the signed certificate did not appear on the resource. Giving up after 10 attempts." >&2 + echo "ERROR: After approving csr ${csrName}, the signed certificate did not appear on the resource. Giving up after 15 attempts." >&2 exit 1 fi echo ${serverCert} | openssl base64 -d -A -out ${tmpdir}/server-cert.pem