Merge pull request #83 from volcano-sh/bug/fix_left_over

Fix issue raised from previous MR
volcano-sh · Apr 9, 2019 · b30ffc3 · b30ffc3
2 parents 3348790 + 92445b2
commit b30ffc3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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