From 89246328252b61b97b8b32f4d22e14727e37032c Mon Sep 17 00:00:00 2001 From: jwcesign Date: Tue, 21 Nov 2023 19:36:09 +0800 Subject: [PATCH] sh: make cluster version configuration unified Signed-off-by: jwcesign --- hack/cli-testing-environment.sh | 2 +- hack/create-cluster.sh | 5 ++++- hack/local-up-karmada.sh | 2 +- hack/util.sh | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/hack/cli-testing-environment.sh b/hack/cli-testing-environment.sh index 8688ba597af1..367bda12c688 100755 --- a/hack/cli-testing-environment.sh +++ b/hack/cli-testing-environment.sh @@ -16,7 +16,7 @@ KUBECONFIG_PATH=${KUBECONFIG_PATH:-"${HOME}/.kube"} HOST_CLUSTER_NAME=${HOST_CLUSTER_NAME:-"karmada-host"} MEMBER_CLUSTER_1_NAME=${MEMBER_CLUSTER_1_NAME:-"member1"} MEMBER_CLUSTER_2_NAME=${MEMBER_CLUSTER_2_NAME:-"member2"} -CLUSTER_VERSION=${CLUSTER_VERSION:-"kindest/node:v1.27.3"} +CLUSTER_VERSION=${CLUSTER_VERSION:-"${DEFAULT_CLUSTER_VERSION}"} BUILD_PATH=${BUILD_PATH:-"_output/bin/linux/amd64"} # prepare the newest crds diff --git a/hack/create-cluster.sh b/hack/create-cluster.sh index 4ef13fabc565..1201692bd500 100755 --- a/hack/create-cluster.sh +++ b/hack/create-cluster.sh @@ -5,13 +5,16 @@ set -o errexit set -o nounset set -o pipefail +REPO_ROOT=$(dirname "${BASH_SOURCE[0]}")/.. +source "${REPO_ROOT}"/hack/util.sh + function usage() { echo "This script starts a kube cluster by kind." echo "Usage: hack/create-cluster.sh [KUBECONFIG]" echo "Example: hack/create-cluster.sh host /root/.kube/karmada.config" } -CLUSTER_VERSION=${CLUSTER_VERSION:-"kindest/node:v1.27.3"} +CLUSTER_VERSION=${CLUSTER_VERSION:-"${DEFAULT_CLUSTER_VERSION}"} if [[ $# -lt 1 ]]; then usage diff --git a/hack/local-up-karmada.sh b/hack/local-up-karmada.sh index 72311e139ed5..35a2587e1abb 100755 --- a/hack/local-up-karmada.sh +++ b/hack/local-up-karmada.sh @@ -48,7 +48,7 @@ MEMBER_CLUSTER_2_TMP_CONFIG="${KUBECONFIG_PATH}/${MEMBER_TMP_CONFIG_PREFIX}-${ME PULL_MODE_CLUSTER_TMP_CONFIG="${KUBECONFIG_PATH}/${MEMBER_TMP_CONFIG_PREFIX}-${PULL_MODE_CLUSTER_NAME}.config" HOST_IPADDRESS=${1:-} -CLUSTER_VERSION=${CLUSTER_VERSION:-"kindest/node:v1.27.3"} +CLUSTER_VERSION=${CLUSTER_VERSION:-"${DEFAULT_CLUSTER_VERSION}"} KIND_LOG_FILE=${KIND_LOG_FILE:-"/tmp/karmada"} #step0: prepare diff --git a/hack/util.sh b/hack/util.sh index 583c4330a8d7..b89581044d4e 100755 --- a/hack/util.sh +++ b/hack/util.sh @@ -25,6 +25,8 @@ KARMADA_GO_PACKAGE="github.com/karmada-io/karmada" MIN_Go_VERSION=go1.20.0 +DEFAULT_CLUSTER_VERSION="kindest/node:v1.27.3" + KARMADA_TARGET_SOURCE=( karmada-aggregated-apiserver=cmd/aggregated-apiserver karmada-controller-manager=cmd/controller-manager