Merge pull request #63 from SamYuan1990/replaceHomeDIR

Replace home dir by project root
sustainable-computing-io · Mar 17, 2024 · 67d9c52 · 67d9c52
2 parents 11a3e4c + e0ec910
commit 67d9c52
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/main.sh b/main.sh
@@ -44,7 +44,7 @@ declare -r PROJECT_ROOT CALLER_PROJECT_ROOT
 # configuration
 declare -r CTR_CMD=${CTR_CMD:-docker}
 declare -r CLUSTER_PROVIDER=${CLUSTER_PROVIDER:-kind}
-declare -r KUBECONFIG_ROOT_DIR=${KUBECONFIG_ROOT_DIR:-$HOME/.kube}
+declare -r KUBECONFIG_ROOT_DIR=${KUBECONFIG_ROOT_DIR:-$PROJECT_ROOT/.kube}
 declare -r KEPLER_KUBECONFIG=${KEPLER_KUBECONFIG:-config-kepler}
 
 declare -r REGISTRY_PORT=${REGISTRY_PORT:-5001}

diff --git a/providers/kind/kind.sh b/providers/kind/kind.sh
@@ -131,6 +131,7 @@ kind_up() {
 	kind_preinstall_check
 	_prepare_config
 	_setup_kind
+	export KUBECONFIG="$KIND_KUBECONFIG"
 	wait_for_cluster_ready
 	kind_wait_up
 	_run_kind_registry

diff --git a/verify.sh b/verify.sh
@@ -20,6 +20,7 @@ set -eu -o pipefail
 
 PROJECT_ROOT="$(git rev-parse --show-toplevel)"
 declare -r PROJECT_ROOT
+declare -r KUBECONFIG_ROOT_DIR=${KUBECONFIG_ROOT_DIR:-$PROJECT_ROOT/.kube}
 # shellcheck source=lib/utils.sh
 source "$PROJECT_ROOT/lib/utils.sh"
 
@@ -43,7 +44,7 @@ verify_bcc() {
 verify_cluster() {
 	# basic check for k8s cluster info
 	info "Verifying cluster status"
-
+	export KUBECONFIG="${KUBECONFIG_ROOT_DIR}/config"
 	run kubectl cluster-info || die "failed to get the cluster-info"
 
 	# check k8s system pod is there...