fix the bug of CRD apiversion and installation volcano with kind (#1483)

Signed-off-by: Thor-wl <13164644535@163.com>

Makefile

@@ -19,7 +19,7 @@ IMAGE_PREFIX=volcanosh/vc
 CRD_OPTIONS ?= "crd:crdVersions=v1"
 CC ?= "gcc"
 SUPPORT_PLUGINS ?= "no"
-CRD_VERSION ?= v1beta1
+CRD_VERSION ?= v1
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

hack/generate-yaml.sh

@@ -28,7 +28,7 @@ export HELM_VER=${HELM_VER:-v3.5.3}
 export VOLCANO_IMAGE_TAG=${TAG:-"latest"}
 export YAML_FILENAME=volcano-${VOLCANO_IMAGE_TAG}.yaml
 export MONITOR_YAML_FILENAME=volcano-monitoring-${VOLCANO_IMAGE_TAG}.yaml
-export CRD_VERSION=${CRD_VERSION:-v1beta1}
+export CRD_VERSION=${CRD_VERSION:-v1}
 
 case $CRD_VERSION in
   bases)

hack/local-up-volcano.sh

@@ -31,7 +31,7 @@ YAML_FILENAME=volcano-${TAG}.yaml
 function prepare {
   echo "Preparing..."
   install-helm
-  echo "Generating valcano deploy yaml"
+  echo "Generating volcano deploy yaml"
   make generate-yaml
 
   echo "Building docker images"
@@ -95,9 +95,7 @@ prepare
 
 if [ "${INSTALL_MODE}" == "kind" ]; then
   kind-up-cluster
-  export KUBECONFIG="$(kind get kubeconfig ${CLUSTER_CONTEXT})"
+  export KUBECONFIG=${HOME}/.kube/config
 fi
 
 install-volcano
-
-