From 1f30238c206489888f577bc535c6defbb307e0aa Mon Sep 17 00:00:00 2001 From: ysicing Date: Thu, 23 May 2024 10:21:17 +0800 Subject: [PATCH] chore: update k3s download version and add port 32380 to FirewalldCheck in checks.go - Update `getk3s.sh` script to download k3s version `v1.28.10+k3s1` instead of `v1.28.9+k3s1` - Add port `32380` to the list of ports checked by the FirewalldCheck in `checks.go` Signed-off-by: ysicing --- hack/scripts/getk3s.sh | 4 ++-- internal/pkg/util/preflight/checks.go | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hack/scripts/getk3s.sh b/hack/scripts/getk3s.sh index 02dddba6..76af7fe0 100755 --- a/hack/scripts/getk3s.sh +++ b/hack/scripts/getk3s.sh @@ -8,10 +8,10 @@ set -xe if [ ! -f "hack/bin/k3s-linux-amd64" ]; then - wget -O hack/bin/k3s-linux-amd64 https://github.com/k3s-io/k3s/releases/download/v1.28.9%2Bk3s1/k3s + wget -O hack/bin/k3s-linux-amd64 https://github.com/k3s-io/k3s/releases/download/v1.28.10%2Bk3s1/k3s fi if [ ! -f "hack/bin/k3s-linux-arm64" ]; then - wget -O hack/bin/k3s-linux-arm64 https://github.com/k3s-io/k3s/releases/download/v1.28.9%2Bk3s1/k3s-arm64 + wget -O hack/bin/k3s-linux-arm64 https://github.com/k3s-io/k3s/releases/download/v1.28.10%2Bk3s1/k3s-arm64 fi chmod +x hack/bin/k3s-linux-amd64 hack/bin/k3s-linux-arm64 diff --git a/internal/pkg/util/preflight/checks.go b/internal/pkg/util/preflight/checks.go index 6be9b469..853780da 100644 --- a/internal/pkg/util/preflight/checks.go +++ b/internal/pkg/util/preflight/checks.go @@ -760,11 +760,12 @@ func RunInitNodeChecks(execer utilsexec.Interface, cfg *types.Metadata, ignorePr // Linux only // TODO: support other OS, if control-plane is supported on it. MemCheck{Mem: common.ControlPlaneMem, Devops: devops}, - FirewalldCheck{ports: []int{80, 443, 6443, 32379}}, + FirewalldCheck{ports: []int{80, 443, 6443, 32379, 32380}}, PortOpenCheck{port: 80}, PortOpenCheck{port: 443}, PortOpenCheck{port: 6443}, PortOpenCheck{port: 32379}, + PortOpenCheck{port: 32380}, NetworkCheck{offline: offline}, // FileAvailableCheck{Path: kubeadmconstants.GetStaticPodFilepath(kubeadmconstants.KubeAPIServer, manifestsDir)}, // FileAvailableCheck{Path: kubeadmconstants.GetStaticPodFilepath(kubeadmconstants.KubeControllerManager, manifestsDir)},