From 359e3efa484c4de094da0129ed38c8a08a132db5 Mon Sep 17 00:00:00 2001
From: gjmzj <jmgaozz@hotmail.com>
Date: Sat, 7 Jan 2023 15:48:05 +0800
Subject: [PATCH] kubeasz release 3.3.2

---
 README.md                           |  6 +--
 docs/release-notes/kubeasz-3.3.2.md | 81 +++++++++++++++++++++++++++++
 ezdown                              |  4 +-
 3 files changed, 86 insertions(+), 5 deletions(-)
 create mode 100644 docs/release-notes/kubeasz-3.3.2.md

diff --git a/README.md b/README.md
index b0e449ac0..bf40c0fb0 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 - **集群特性** [Master高可用](docs/setup/00-planning_and_overall_intro.md#ha-architecture)、[离线安装](docs/setup/offline_install.md)、[多架构支持(amd64/arm64)](docs/setup/multi_platform.md)
 - **集群版本** kubernetes v1.22, v1.23, v1.24, v1.25, v1.26
 - **操作系统** CentOS/RedHat 7/8, Debian 9/10, Ubuntu 16.04/18.04/20.04/22.04
-- **运行时** [containerd](docs/setup/03-container_runtime.md) v1.6.8, docker 20.10.x (k8s < 1.24)
+- **运行时** [containerd](docs/setup/03-container_runtime.md) v1.6.x, 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)
 
 
@@ -31,8 +31,8 @@
       <td>kubeasz version</td>
       <td>3.1.1</td>
       <td>3.2.0</td>
-      <td>3.3.1</td>
-      <td>3.4.2</td>
+      <td>3.3.2</td>
+      <td>3.4.3</td>
       <td>3.5.0</td>
     </tr>
   </tbody>
diff --git a/docs/release-notes/kubeasz-3.3.2.md b/docs/release-notes/kubeasz-3.3.2.md
new file mode 100644
index 000000000..37a99c3e7
--- /dev/null
+++ b/docs/release-notes/kubeasz-3.3.2.md
@@ -0,0 +1,81 @@
+## kubeasz 3.3.2
+
+kubeasz 3.3.2 发布，小版本更新以及一些bugfix。
+
+### 版本更新
+ - k8s: v1.24.9
+ - containerd: v1.6.14
+ - calico: v3.23.5
+ - cilium: v1.12.4
+ - dashboard: v2.7.0
+ - pause: 3.9
+ - harbor: v2.1.5
+ - k8s-dns-node-cache: 1.22.13
+
+### 其他
+
+其他更新或者修复，主要以cherry-pick形式从master分支拉取更新。
+
+ - update kubeasz-ext-bin 1.6.4, containerd v1.6.14
+ - 更新etcd文档 (#1218)
+ - update harbor v2.1.5
+ - fix: containerd无法拉取harbor的镜像
+ - 检测  ex-lb 的 kube-apiserver 是否正常 (#1215)
+ - update cilium 1.12.4
+ - update docs:README.md
+ - update component
+ - minor changes
+ - 修改 completion 自动补全 (#1213)
+ - 检测 harbor 端口能否连接 (#1211)
+ - 修改 nodelocaldns 上游 dns 配置 (#1210)
+ - docs update
+ - 调整集群内api服务地址和dns服务地址设置方式
+ - 自定义 harbor 安装路径 (#1209)
+ - 忽略文件不存在 (#1206)
+ - update components
+ - 加载环境变量, 避免 iptables 命令不存在 (#1203)
+ - shell加载环境变量 (#1202)
+ - fix: installing offline system packages
+ - fix to support recreating CA and certs
+ - adjust scripts to support recreating CA and certs
+ - modify to run 'cluster-addon' setup on ansible host
+ - fix kube-apiserver 访问 kubelet的权限
+ - #1183 add 96.update-certs.yml
+ - 修改默认配置的 Kubernetes CA 证书 (#1197)
+ - New dev (#1193)
+ - update container image mirror site #1192
+ - 修改ectd 备份命令和备份路径均在 ansible 节点
+ -        modified:   roles/calico/templates/calico-v3.23.yaml.j2
+ - Create calico-v3.19.yaml.j2
+ - 更新 roles/kube-master/main.yml 修改证书时复制新证书到Master节点
+ - modify stale issues checking
+ - add a bot to manage issues
+ - fix issue:#1159
+ - fix docs
+ - replace 'uname -p(non-portable)' to 'uname -m'
+ - update README
+ - update docs
+ - remove the need of admin kubeconfig on master nodes
+ - remove kubectl admin kubeconfig to improve security
+ - fix: curl dns resolving problem in a rare case
+ - add multi-platform support for json-mock:v1.3.0
+ - add support for multi-platform part2
+ - feat: add support for multi-platform in "ezdown"
+ - fix display images in docs:cilium-example.md
+ - to clean some pics
+ - fix logo url
+ - fix: ca-config.json by libinglong
+ - Update main.yml
+ - Update ezctl
+ - Update 01-CA_and_prerequisite.md
+ - update cilium 1.12.2
+ - fix flannel v0.19.2
+ - update flannel v0.19.2
+ - update nodelocaldns 1.22.8
+ - fix: cilium 1.12.1 setup
+ - update cilium 1.12.1
+ - update kube-prometheus-stack-39.11.0
+ - update k8s binary & calico version
+ - Update config.yml
+ - 修复calico ipip隧道模式说明错误，并完善可选参数说明以及使用场景
+ - fix custom PATH settings
diff --git a/ezdown b/ezdown
index 40a17c782..d02e91654 100755
--- a/ezdown
+++ b/ezdown
@@ -14,8 +14,8 @@ set -o pipefail
 
 # default settings, can be overridden by cmd line options, see usage
 DOCKER_VER=20.10.18
-KUBEASZ_VER=3.5.0
-K8S_BIN_VER=v1.26.0
+KUBEASZ_VER=3.3.2
+K8S_BIN_VER=v1.24.9
 EXT_BIN_VER=1.6.4
 SYS_PKG_VER=0.5.2
 HARBOR_VER=v2.1.5