diff --git a/README.md b/README.md
index 68c424f..c54e681 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,9 @@
项目致力于提供快速部署高可用`k8s`集群的工具, 同时也努力成为`k8s`实践、使用的参考书；基于二进制方式部署和利用`ansible-playbook`实现自动化；既提供一键安装脚本, 也可以根据`安装指南`分步执行安装各个组件。
- **集群特性** `TLS`双向认证、`RBAC`授权、[多Master高可用](docs/setup/00-planning_and_overall_intro.md#ha-architecture)、支持`Network Policy`、备份恢复、[离线安装](docs/setup/offline_install.md)
-- **集群版本** kubernetes v1.20, v1.21, v1.22, v1.23
+- **集群版本** kubernetes v1.21, v1.22, v1.23, v1.24
- **操作系统** CentOS/RedHat 7, Debian 9/10, Ubuntu 16.04/18.04/20.04
-- **运行时** docker 19.03.x, 20.10.x [containerd](docs/setup/containerd.md) v1.5.8
+- **运行时** [containerd](docs/setup/containerd.md) v1.6.4, docker 20.10.x (k8s < 1.24)
- **网络** [calico](docs/setup/network-plugin/calico.md), [cilium](docs/setup/network-plugin/cilium.md), [flannel](docs/setup/network-plugin/flannel.md), [kube-ovn](docs/setup/network-plugin/kube-ovn.md), [kube-router](docs/setup/network-plugin/kube-router.md)
@@ -24,6 +24,7 @@
| 1.21 |
1.22 |
1.23 |
+ 1.24 |
@@ -34,6 +35,7 @@
3.1.0 |
3.1.1 |
3.2.0 |
+ 3.3.0 |
@@ -71,7 +73,6 @@
metrics-server |
prometheus |
efk |
- ingress |
| 集群管理+ |
@@ -80,7 +81,6 @@
管理etcd节点 |
升级集群 |
备份恢复 |
- |
| 特性实验 |
@@ -89,7 +89,6 @@
HPA |
|
|
- |
| 周边生态 |
@@ -98,25 +97,6 @@
jenkins |
gitlab |
|
- |
-
-
- | 应用实践 |
- go web应用部署 |
- java应用部署 |
- elasticsearch集群 |
- mariadb集群 |
- |
- |
-
-
- | 推荐工具 |
- kuboard |
- k9s |
- octant |
- KubeSphere |
- |
- |
diff --git a/docs/guide/kuboard.md b/docs/deprecated/kuboard.md
similarity index 100%
rename from docs/guide/kuboard.md
rename to docs/deprecated/kuboard.md
diff --git a/docs/practice/dockerize_system_service.md b/docs/deprecated/practice/dockerize_system_service.md
similarity index 100%
rename from docs/practice/dockerize_system_service.md
rename to docs/deprecated/practice/dockerize_system_service.md
diff --git a/docs/practice/es_cluster.md b/docs/deprecated/practice/es_cluster.md
similarity index 100%
rename from docs/practice/es_cluster.md
rename to docs/deprecated/practice/es_cluster.md
diff --git a/docs/practice/go_web_app/Dockerfile b/docs/deprecated/practice/go_web_app/Dockerfile
similarity index 100%
rename from docs/practice/go_web_app/Dockerfile
rename to docs/deprecated/practice/go_web_app/Dockerfile
diff --git a/docs/practice/go_web_app/Dockerfile-more b/docs/deprecated/practice/go_web_app/Dockerfile-more
similarity index 100%
rename from docs/practice/go_web_app/Dockerfile-more
rename to docs/deprecated/practice/go_web_app/Dockerfile-more
diff --git a/docs/practice/go_web_app/hellogo.go b/docs/deprecated/practice/go_web_app/hellogo.go
similarity index 100%
rename from docs/practice/go_web_app/hellogo.go
rename to docs/deprecated/practice/go_web_app/hellogo.go
diff --git a/docs/practice/go_web_app/hellogo.yaml b/docs/deprecated/practice/go_web_app/hellogo.yaml
similarity index 100%
rename from docs/practice/go_web_app/hellogo.yaml
rename to docs/deprecated/practice/go_web_app/hellogo.yaml
diff --git a/docs/practice/go_web_app/readme.md b/docs/deprecated/practice/go_web_app/readme.md
similarity index 100%
rename from docs/practice/go_web_app/readme.md
rename to docs/deprecated/practice/go_web_app/readme.md
diff --git a/docs/practice/java_war_app.md b/docs/deprecated/practice/java_war_app.md
similarity index 100%
rename from docs/practice/java_war_app.md
rename to docs/deprecated/practice/java_war_app.md
diff --git a/docs/practice/mariadb_cluster.md b/docs/deprecated/practice/mariadb_cluster.md
similarity index 100%
rename from docs/practice/mariadb_cluster.md
rename to docs/deprecated/practice/mariadb_cluster.md
diff --git a/docs/release-notes/kubeasz-3.3.0.md b/docs/release-notes/kubeasz-3.3.0.md
new file mode 100644
index 0000000..2832119
--- /dev/null
+++ b/docs/release-notes/kubeasz-3.3.0.md
@@ -0,0 +1,35 @@
+## kubeasz 3.3.0 (Grain in Ear)
+
+泽草所生，种之芒种。kubeasz 3.3.0 发布更新支持k8s 1.24 版本。
+
+### 主要更新
+
+#### 1.容器运行时
+
+修改默认容器运行时为containerd，kubeasz 3.3.0 暂未适配docker 和其他容器运行时；集群使用containerd作为运行时，确实更简单、稳定；至于docker，镜像打包、单机运行容器等等真好用；各自发挥所长吧；kubeasz项目中在离线资源下载、安装中使用docker非常方便，还可以避免在部署机器上安装ansible等麻烦事，推荐使用。
+
+#### 2.去除安装ingress插件
+
+ingress一般是具体业务强相关的，属于上层组件；鉴于维护人力和频率，项目中仅保留历史相关ingress文档，不再继续更新；请移步相关ingress组件官网获取更新部署方式；kubeasz 今后将更加关注底层集群组件的更新和维护。做简单，做好一件事。
+
+#### 3.更新prometheus安装套件
+
+监控组件属于底层功能，将持续更新；项目使用kube-prometheus-stack helm chart 默认部署，需要自定义设置请参考项目 https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack
+
+### 组件更新
+
+- k8s: v1.24.1
+- etcd: v3.5.4
+- containerd: 1.6.4
+- calico: v3.19.4
+- cni-plugins: v1.1.1
+- dashboard: v2.5.1
+
+### 其他
+
+- 调整kube-controller-manager启动配置文件
+- 调整kubelet启用配置文件
+- 修复部分系统首次执行安装失败 (缺失 '/usr/bin/python')
+- 修复'ezdown‘运行可能会遗留容器导致再次运行失败
+- 部分文档更新
+- fix: get secret tokens for dashboard login in v1.24