From a250741823f49ef519113a34c1e285042f99685f Mon Sep 17 00:00:00 2001 From: gjmzj Date: Thu, 15 Apr 2021 20:43:54 +0800 Subject: [PATCH] update components version --- README.md | 6 +++--- example/config.yml | 2 +- ezctl | 2 ++ ezdown | 10 +++++----- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index ac3eaa7..50fe986 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,13 @@ 项目致力于提供快速部署高可用`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.17, v1.18, v1.19, v1.20 +- **集群版本** kubernetes v1.18, v1.19, v1.20, v1.21 - **操作系统** CentOS/RedHat 7, Debian 9/10, Ubuntu 16.04/18.04/20.04 -- **运行时** docker 18.09.x, 19.03.x, 20.10.x [containerd](docs/setup/containerd.md) v1.4.3 +- **运行时** docker 19.03.x, 20.10.x [containerd](docs/setup/containerd.md) v1.4.4 - **网络** [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) -**[news]** kubeasz 技术上通过cncf一致性测试 [详情](docs/mixes/conformance.md) +**[news]** kubeasz 通过cncf一致性测试 [详情](https://github.com/cncf/k8s-conformance/tree/master/v1.20/kubeasz) **[news]** 群里大佬上新一套免费[kubernetes架构师课程](https://www.toutiao.com/c/user/token/MS4wLjABAAAA0YFomuMNm87NNysXeUsQdI0Tt3gOgz8WG_0B3MzxsmI/?tab=article)，强烈推荐！ diff --git a/example/config.yml b/example/config.yml index f972871..e513556 100644 --- a/example/config.yml +++ b/example/config.yml @@ -46,7 +46,7 @@ ETCD_WAL_DIR: "" ENABLE_MIRROR_REGISTRY: true # [containerd]基础容器镜像 -SANDBOX_IMAGE: "easzlab/pause-amd64:3.2" +SANDBOX_IMAGE: "easzlab/pause-amd64:__pause__" # [containerd]容器持久化存储目录 CONTAINERD_STORAGE_DIR: "/var/lib/containerd" diff --git a/ezctl b/ezctl index 24c9a90..1b89bf4 100755 --- a/ezctl +++ b/ezctl @@ -151,6 +151,7 @@ function new() { dashboardMetricsScraperVer=$(grep 'dashboardMetricsScraperVer=' ezdown|cut -d'=' -f2) metricsVer=$(grep 'metricsVer=' ezdown|cut -d'=' -f2) nfsProvisionerVer=$(grep 'nfsProvisionerVer=' ezdown|cut -d'=' -f2) + pauseVer=$(grep 'pauseVer=' ezdown|cut -d'=' -f2) promChartVer=$(grep 'promChartVer=' ezdown|cut -d'=' -f2) traefikChartVer=$(grep 'traefikChartVer=' ezdown|cut -d'=' -f2) harborVer=$(grep 'HARBOR_VER=' ezdown|cut -d'=' -f2) @@ -164,6 +165,7 @@ function new() { -e "s/__kube_ovn__/$kubeOvnVer/g" \ -e "s/__kube_router__/$kubeRouterVer/g" \ -e "s/__coredns__/$corednsVer/g" \ + -e "s/__pause__/$pauseVer/g" \ -e "s/__dns_node_cache__/$dnsNodeCacheVer/g" \ -e "s/__dashboard__/$dashboardVer/g" \ -e "s/__dash_metrics__/$dashboardMetricsScraperVer/g" \ diff --git a/ezdown b/ezdown index 3e67f22..a962987 100755 --- a/ezdown +++ b/ezdown @@ -14,9 +14,9 @@ set -o errexit # default settings, can be overridden by cmd line options, see usage DOCKER_VER=20.10.5 -KUBEASZ_VER=3.0.1 +KUBEASZ_VER=3.1.0 K8S_BIN_VER=v1.21.0 -EXT_BIN_VER=0.9.2 +EXT_BIN_VER=0.9.4 SYS_PKG_VER=0.4.1 HARBOR_VER=v2.1.3 REGISTRY_MIRROR=CN @@ -24,12 +24,12 @@ REGISTRY_MIRROR=CN # images needed by k8s cluster calicoVer=v3.15.3 flannelVer=v0.13.0-amd64 -dnsNodeCacheVer=1.16.0 -corednsVer=1.8.3 +dnsNodeCacheVer=1.17.0 +corednsVer=1.8.0 dashboardVer=v2.2.0 dashboardMetricsScraperVer=v1.0.6 metricsVer=v0.3.6 -pauseVer=3.2 +pauseVer=3.4.1 nfsProvisionerVer=v4.0.1 export ciliumVer=v1.4.1 export kubeRouterVer=v0.3.1