From e068d46ed094f910c71dbfc425fa4f847c8947b6 Mon Sep 17 00:00:00 2001 From: gjmzj Date: Thu, 19 Nov 2020 23:51:53 +0800 Subject: [PATCH] kubeasz release 2.2.2 --- README.md | 2 +- docs/release-notes/kubeasz-2.2.2.md | 2 +- manifests/dashboard/kubernetes-dashboard.yaml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f36dc07..7002ae7 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ 项目致力于提供快速部署高可用`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.15, v1.16, v1.17, v1.18 +- **集群版本** kubernetes v1.16, v1.17, v1.18, v1.19 - **操作系统** CentOS/RedHat 7, Debian 9/10, Ubuntu 1604/1804 - **运行时** docker 18.06.x-ce, 18.09.x, 19.03.x [containerd](docs/guide/containerd.md) 1.2.6 - **网络** [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) diff --git a/docs/release-notes/kubeasz-2.2.2.md b/docs/release-notes/kubeasz-2.2.2.md index e46ad6f..d19577d 100644 --- a/docs/release-notes/kubeasz-2.2.2.md +++ b/docs/release-notes/kubeasz-2.2.2.md @@ -19,4 +19,4 @@ CHANGELOG: - 文档 - Update kuboard.md #861 - 其他 - - 调整etcd备份文件名称 #902 #932 + - 调整etcd备份文件 #902 #932 #933 diff --git a/manifests/dashboard/kubernetes-dashboard.yaml b/manifests/dashboard/kubernetes-dashboard.yaml index af07c2b..8f5c199 100644 --- a/manifests/dashboard/kubernetes-dashboard.yaml +++ b/manifests/dashboard/kubernetes-dashboard.yaml @@ -189,7 +189,7 @@ spec: spec: containers: - name: kubernetes-dashboard - image: kubernetesui/dashboard:v2.0.1 + image: kubernetesui/dashboard:v2.0.4 ports: - containerPort: 8443 protocol: TCP @@ -290,6 +290,8 @@ spec: runAsUser: 1001 runAsGroup: 2001 serviceAccountName: kubernetes-dashboard + nodeSelector: + "kubernetes.io/os": linux # Comment the following tolerations if Dashboard must not be deployed on master tolerations: - key: node-role.kubernetes.io/master