diff --git a/README.md b/README.md index 7b05291..ac3eaa7 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ - **集群特性** `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 -- **操作系统** CentOS/RedHat 7, Debian 9/10, Ubuntu 1604/1804 +- **操作系统** 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 - **网络** [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/ezdown b/ezdown index f342615..3e67f22 100755 --- a/ezdown +++ b/ezdown @@ -17,7 +17,7 @@ DOCKER_VER=20.10.5 KUBEASZ_VER=3.0.1 K8S_BIN_VER=v1.21.0 EXT_BIN_VER=0.9.2 -SYS_PKG_VER=0.3.3 +SYS_PKG_VER=0.4.1 HARBOR_VER=v2.1.3 REGISTRY_MIRROR=CN diff --git a/roles/prepare/tasks/offline.yml b/roles/prepare/tasks/offline.yml index 108081b..f447bfb 100644 --- a/roles/prepare/tasks/offline.yml +++ b/roles/prepare/tasks/offline.yml @@ -36,6 +36,23 @@ when: ansible_distribution_release == "bionic" ignore_errors: true +- block: + - name: 分发 basic_focal 离线包 + copy: + src: "{{ base_dir }}/down/packages/basic_focal.tar.gz" + dest: "/opt/kube/packages/basic/basic_focal.tar.gz" + + # 离线安装包可能需要安装多次才能成功 + - name: 安装 basic_focal 离线包 + shell: 'cd /opt/kube/packages/basic && tar zxf basic_focal.tar.gz && \ + dpkg -i *.deb > /tmp/install_basic.log 2>&1' + register: install_info + until: not install_info.failed + retries: 3 + delay: 1 + when: ansible_distribution_release == "focal" + ignore_errors: true + - block: - name: 分发 basic_centos7 离线包 copy: