From f3054814242c65ba90a2c75bd896335cf6df8bea Mon Sep 17 00:00:00 2001 From: Xiechengqi Date: Fri, 30 Aug 2024 17:56:16 +0800 Subject: [PATCH] Update install.sh --- install/K8S/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/K8S/install.sh b/install/K8S/install.sh index 2ded5f9..cdf9911 100644 --- a/install/K8S/install.sh +++ b/install/K8S/install.sh @@ -13,7 +13,7 @@ source <(curl -SsL $BASEURL/tool/common.sh) _ubuntu() { -EXEC "rm -f /etc/apt/sources.list.d/kubernetes.list" +EXEC "rm -f /etc/apt/keyrings/kubernetes-apt-keyring.gpg" EXEC "curl -fsSL https://pkgs.k8s.io/core:/stable:/${version}/deb/Release.key | gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg" cat > /etc/apt/sources.list.d/kubernetes.list << EOF deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://mirrors.tuna.tsinghua.edu.cn/kubernetes/core:/stable:/${version}/deb/ / @@ -47,7 +47,7 @@ osInfo=`get_os` && INFO "current os: $osInfo" serviceName="kubelet" version="v1.28" versionTag="0" -VERSION="${version}-${versionTag}" +VERSION="${version}.${versionTag}" # countryCode=`curl -SsL https://api.ip.sb/geoip | sed 's/,/\n/g' | grep country_code | awk -F '"' '{print $(NF-1)}'` curl -SsL cip.cc | grep -E '^地址' | head -1 | grep '中国' &> /dev/null && countryCode="CN" || countryCode="Other"