Skip to content

Commit

Permalink
fix: update k3s version (#1410)
Browse files Browse the repository at this point in the history
  • Loading branch information
DokiDoki1103 authored Dec 4, 2023
1 parent e659d60 commit 6f23b63
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.dind
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,13 @@ RUN wget -O /app/ui/01-rbd-operator.yml "https://get.rainbond.com/01-rbd-operato
if [ "${ARCH}" = "arm64" ] || [ "${ARCH}" = "aarch64" ]; then \
wget -O /app/ui/helm "https://pkg.goodrain.com/pkg/helm/v3.10.1/helm-arm64" && chmod +x /app/ui/helm; \
wget -O /app/ui/nerdctl "https://pkg.goodrain.com/pkg/nerdctl/v1.0.0/nerdctl-arm64" && chmod +x /app/ui/nerdctl; \
wget -O /app/ui/k3s "https://pkg.goodrain.com/pkg/k3s/v1.22.3-k3s1/k3s-arm64" && chmod +x /app/ui/k3s; \
wget -O /app/ui/k3s "https://pkg.goodrain.com/pkg/k3s/v1.25.15-k3s1/k3s-arm64" && chmod +x /app/ui/k3s; \
wget -O /app/ui/log "https://pkg.rainbond.com/images-pkg/arm64/log" && chmod +x /app/ui/log; \
wget https://rainbond-pkg.oss-cn-shanghai.aliyuncs.com/upx/upx-4.0.2-arm64_linux/upx && chmod +x upx && mv upx /usr/local/bin/upx; \
else \
wget -O /app/ui/helm "https://pkg.goodrain.com/pkg/helm/v3.10.1/helm" && chmod +x /app/ui/helm; \
wget -O /app/ui/nerdctl "https://pkg.goodrain.com/pkg/nerdctl/v1.0.0/nerdctl" && chmod +x /app/ui/nerdctl; \
wget -O /app/ui/k3s "https://pkg.goodrain.com/pkg/k3s/v1.22.3-k3s1/k3s" && chmod +x /app/ui/k3s; \
wget -O /app/ui/k3s "https://pkg.goodrain.com/pkg/k3s/v1.25.15-k3s1/k3s" && chmod +x /app/ui/k3s; \
wget -O /app/ui/log "https://pkg.rainbond.com/images-pkg/log" && chmod +x /app/ui/log; \
echo "deb http://archive.debian.org/debian/ stretch main" > /etc/apt/sources.list && \
echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list && \
Expand Down
4 changes: 2 additions & 2 deletions entrypoint-dind.sh
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ function start_k3s {
echo -e "${GREEN}$(date "$TIME") INFO: K3s is starting, please wait ············································${NC}"
while_num=0
while true; do
K3S_STATUS=$(netstat -nltp | grep k3s | grep -c -E "6443|6444|10248|10249|10250|10251|10256|10257|10258|10259")
if [[ "${K3S_STATUS}" == "10" ]]; then
K3S_STATUS=$(netstat -nltp | grep k3s | grep -c -E "6443|6444|10248|10249|10250|10256|10257|10258|10259")
if [[ "${K3S_STATUS}" == "9" ]]; then
if k3s kubectl get node | grep Ready >/dev/null 2>&1; then
echo -e "${GREEN}$(date "$TIME") INFO: K3s Started successfully ${NC}"
break
Expand Down

0 comments on commit 6f23b63

Please sign in to comment.