Skip to content

Commit

Permalink
feat(autok3s): bump up ui and docs version
Browse files Browse the repository at this point in the history
  • Loading branch information
JacieChao committed Jan 9, 2024
1 parent b7118ab commit aa2e6f1
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ Scenario 1 - Run with docker:
```bash
# The commands will start autok3s daemon with an interactionable UI.
# Standard Linux (Recommended)
$ docker run -itd --restart=unless-stopped --net=host -v /var/run/docker.sock:/var/run/docker.sock cnrancher/autok3s:v0.9.1
$ docker run -itd --restart=unless-stopped --net=host -v /var/run/docker.sock:/var/run/docker.sock cnrancher/autok3s:v0.9.2

# MacOS
$ docker run -itd --restart=unless-stopped -p 8080:8080 -v /var/run/docker.sock:/var/run/docker.sock -e DOCKER_HOST="" cnrancher/autok3s:v0.9.1
$ docker run -itd --restart=unless-stopped -p 8080:8080 -v /var/run/docker.sock:/var/run/docker.sock -e DOCKER_HOST="" cnrancher/autok3s:v0.9.2
```

Scenario 2 - Run with docker-compose
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
volumes:
- /var/run/docker.sock:/tmp/docker.sock:ro
autok3s:
image: cnrancher/autok3s:v0.9.1
image: cnrancher/autok3s:v0.9.2
init: true
ports:
- 8080
Expand Down
2 changes: 1 addition & 1 deletion docs/i18n/en_us/k3d/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,6 @@ K3d needs to mount the resource limit file into k3s container which requires the

Please mount the `.k3d` directory when start the AutoK3s by Docker. The following command is an example.
```bash
docker run -itd --restart=unless-stopped --net=host -v /var/run/docker.sock:/var/run/docker.sock -v /root/.k3d:/root/.k3d cnrancher/autok3s:v0.8.0
docker run -itd --restart=unless-stopped --net=host -v /var/run/docker.sock:/var/run/docker.sock -v /root/.config/k3d:/root/.config/k3d cnrancher/autok3s:v0.9.2
```

10 changes: 5 additions & 5 deletions docs/i18n/zh_cn/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ AutoK3s 可以支持以下云厂商,我们会根据社区反馈添加更多支
您可以通过以下 Docker 命令,一键启动 AutoK3s 本地 UI,快速体验相关功能。

```bash
docker run -itd --restart=unless-stopped -p 8080:8080 cnrancher/autok3s:v0.9.1
docker run -itd --restart=unless-stopped -p 8080:8080 cnrancher/autok3s:v0.9.2
```

如果您想要在 docker 中使用 K3d provider,那么您需要使用宿主机网络启动 AutoK3s 镜像。

```bash
docker run -itd --restart=unless-stopped --net host -v /var/run/docker.sock:/var/run/docker.sock cnrancher/autok3s:v0.9.1
docker run -itd --restart=unless-stopped --net host -v /var/run/docker.sock:/var/run/docker.sock cnrancher/autok3s:v0.9.2
```

如果您是 MacOS 或者 Linux 系统,您也可以使用以下安装命令,一键安装 AutoK3s(Windows用户请前往 [Releases](https://github.com/cnrancher/autok3s/releases) 页面下载对应的程序)。
Expand Down Expand Up @@ -81,19 +81,19 @@ autok3s -d create -p aws --name myk3s --master 1 --worker 1

## 升级

如果您使用 Docker 命令一键启动 AutoK3s 本地 UI,从 `v0.4.0` 升级到 `v0.9.1` 需要进行如下操作以保证历史数据的迁移。
如果您使用 Docker 命令一键启动 AutoK3s 本地 UI,从 `v0.4.0` 升级到 `v0.9.2` 需要进行如下操作以保证历史数据的迁移。

```bash
docker cp <old-container>:/root/.autok3s .
docker rm -f <old-container>
docker run -itd --restart=unless-stopped -p 8080:8080 -v $PWD/.autok3s:/root/.autok3s cnrancher/autok3s:v0.9.1
docker run -itd --restart=unless-stopped -p 8080:8080 -v $PWD/.autok3s:/root/.autok3s cnrancher/autok3s:v0.9.2
```

`v0.4.1` 以后的版本,可以直接通过 `--volumes-from` 来保证历史数据的迁移。

```bash
docker stop <old-container>
docker run -itd --restart=unless-stopped -p 8080:8080 --volumes-from <old-container> cnrancher/autok3s:v0.9.1
docker run -itd --restart=unless-stopped -p 8080:8080 --volumes-from <old-container> cnrancher/autok3s:v0.9.2
```

## 开发者指南
Expand Down
2 changes: 1 addition & 1 deletion docs/i18n/zh_cn/k3d/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -329,5 +329,5 @@ time="2023-05-25T02:54:23Z" level=info msg="[k3d] executing rollback logic..."

如果出现以上问题,可以在启动 AutoK3s 容器时尝试将本地的 `.k3d` 目录挂载到 Docker 中,例如
```bash
docker run -itd --restart=unless-stopped --net=host -v /var/run/docker.sock:/var/run/docker.sock -v /root/.k3d:/root/.k3d cnrancher/autok3s:v0.8.0
docker run -itd --restart=unless-stopped --net=host -v /var/run/docker.sock:/var/run/docker.sock -v /root/.config/k3d:/root/.config/k3d cnrancher/autok3s:v0.9.2
```
4 changes: 2 additions & 2 deletions hack/make-rules/autok3s.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CURR_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
# The root of the autok3s directory
ROOT_DIR="${CURR_DIR}"
CROSS=${CROSS:-}
UI_VERSION="v0.9.2-rc1"
UI_VERSION="v0.9.2"

source "${ROOT_DIR}/hack/lib/init.sh"
source "${CURR_DIR}/hack/lib/constant.sh"
Expand All @@ -34,7 +34,7 @@ function mod() {
}

function ui() {
autok3s::log::info "downloading autok3s ui"
autok3s::log::info "downloading autok3s ui ${UI_VERSION}"
cd pkg/server/ui
curl -sL https://autok3s-ui.s3-ap-southeast-2.amazonaws.com/${UI_VERSION}.tar.gz | tar xvzf -
cd ${CURR_DIR}
Expand Down

0 comments on commit aa2e6f1

Please sign in to comment.