Skip to content

Commit

Permalink
chore: update k3s download version and add port 32380 to FirewalldChe…
Browse files Browse the repository at this point in the history
…ck 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 <[email protected]>
  • Loading branch information
ysicing committed May 23, 2024
1 parent 72aed51 commit 1f30238
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
4 changes: 2 additions & 2 deletions hack/scripts/getk3s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion internal/pkg/util/preflight/checks.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)},
Expand Down

0 comments on commit 1f30238

Please sign in to comment.