1.remove useless code

2.add kubeconfig Signed-off-by: lfbear <lfbear@gmail.com>
karmada-io · May 20, 2021 · 2df30f8 · 2df30f8
1 parent a2bab56
commit 2df30f8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/hack/deploy-karmada.sh b/hack/deploy-karmada.sh
@@ -14,7 +14,6 @@ KARMADA_APISERVER_SECURE_PORT=${KARMADA_APISERVER_SECURE_PORT:-5443}
 
 # The host cluster name which used to install karmada control plane components.
 HOST_CLUSTER_NAME=${HOST_CLUSTER_NAME:-"karmada-host"}
-HOST_CLUSTER_KUBECONFIG=${1:-"${HOME}/.kube/karmada-host.config"}
 ROOT_CA_FILE=${CERT_DIR}/server-ca.crt
 CFSSL_VERSION="v1.5.0"
 CONTROLPLANE_SUDO=$(test -w "${CERT_DIR}" || echo "sudo -E")

diff --git a/hack/local-up-karmada.sh b/hack/local-up-karmada.sh
@@ -42,7 +42,7 @@ kind load docker-image "${REGISTRY}/karmada-webhook:${VERSION}" --name="${HOST_C
 # deploy karmada control plane
 KARMADA_APISERVER_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "${HOST_CLUSTER_NAME}-control-plane")
 "${SCRIPT_ROOT}"/hack/deploy-karmada.sh "${HOST_CLUSTER_KUBECONFIG}" "${HOST_CLUSTER_NAME}" "${KARMADA_APISERVER_IP}"
-kubectl config use-context karmada-apiserver
+kubectl config use-context karmada-apiserver --kubeconfig="${HOST_CLUSTER_KUBECONFIG}"
 
 function print_success() {
   echo

diff --git a/hack/remote-up-karmada.sh b/hack/remote-up-karmada.sh
@@ -36,6 +36,7 @@ fi
 # deploy karmada control plane
 SCRIPT_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 "${SCRIPT_ROOT}"/hack/deploy-karmada.sh "${HOST_CLUSTER_KUBECONFIG}" "${HOST_CLUSTER_NAME}"
+kubectl config use-context karmada-apiserver --kubeconfig="${HOST_CLUSTER_KUBECONFIG}"
 
 function print_success() {
   echo