Add KylinOS V10SP2 amd64 and aarch64 support

wise2c-devops · Feb 10, 2024 · 598e60d · 598e60d
1 parent 36c09a1
commit 598e60d
Show file tree

Hide file tree

Showing 85 changed files with 932 additions and 564 deletions.
diff --git a/BreezeManual-CN.md b/BreezeManual-CN.md
@@ -4,11 +4,7 @@
 
 适用操作系统：
 
-RHEL/CentOS: 7.4/7.5/7.6/7.7/7.8/7.9
-
-RHEL/CentOS/RockyLinux/AlmaLinux/OracleLinux: 8.4+
-
-Ubuntu 18/20 LTS
+麒麟V10 SP2
 
 **所有社区用户请注意：**	
 
@@ -64,13 +60,13 @@ firewall-cmd --complete-reload
 （2）安装docker-compose命令
 
 ```
-curl -L https://github.com/docker/compose/releases/download/v2.14.1/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
+curl -L https://github.com/docker/compose/releases/download/1.24.1/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
 ```
 
 或从镜像站点下载：
 
 ```
-curl -L http://mirror.azure.cn/docker-toolbox/linux/compose/v2.14.1/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose
+curl -L http://mirror.azure.cn/docker-toolbox/linux/compose/1.25.4/docker-compose-Linux-x86_64 -o /usr/local/bin/docker-compose
 ```
 
 然后设置权限：
@@ -90,17 +86,17 @@ systemctl enable docker
 (4) 下载用于部署某个Kubernetes版本的docker-compose文件并使部署程序运行起来，例如：
 
 ```
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.23.17-docker/docker-compose.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.23.17-docker/docker-compose-centos.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.23.17-docker/docker-compose-ubuntu.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.23.17/docker-compose.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.23.17/docker-compose-centos.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.23.17/docker-compose-ubuntu.yml -o docker-compose.yml
 ```
 
 国内用户可以使用阿里云镜像站点文件，部署所用的image将从阿里云拉取：
 
 ```
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.23.17-docker/docker-compose-aliyun.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.23.17-docker/docker-compose-centos-aliyun.yml -o docker-compose.yml
-curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.23.17-docker/docker-compose-ubuntu-aliyun.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.23.17/docker-compose-aliyun.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.23.17/docker-compose-centos-aliyun.yml -o docker-compose.yml
+curl -L https://raw.githubusercontent.com/wise2c-devops/breeze/v1.23.17/docker-compose-ubuntu-aliyun.yml -o docker-compose.yml
 ```
 
 然后：

diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /workspace
 
 COPY callback_plugins /workspace/callback_plugins
 COPY docker-playbook /workspace/docker-playbook
+COPY crio-playbook /workspace/crio-playbook
 COPY etcd-playbook /workspace/etcd-playbook
 COPY kubernetes-playbook /workspace/kubernetes-playbook
 COPY harbor-playbook /workspace/harbor-playbook

diff --git a/README-CN.md b/README-CN.md
@@ -1,7 +1,7 @@
 # Breeze
 - 可用于生产环境的图形化Kubernetes集群部署工具
 
-[![pipeline status](https://gitlab.com/alanpeng/breeze/badges/master/pipeline.svg)](https://gitlab.com/alanpeng/breeze/-/commits/v1.21)
+[![pipeline status](https://gitlab.com/alanpeng/breeze/badges/master/pipeline.svg)](https://gitlab.com/alanpeng/breeze/-/commits/v1.23)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/wise2c-devops/breeze/blob/master/LICENSE)
 
 [English](./README.md) | [中文](./README-CN.md)
@@ -51,7 +51,7 @@ Breeze项目旨在提供一个可信的、安全的、稳定的Kubernetes集群
 
 **部署机:** docker 1.13.1+ and docker-compose 1.12.0+ .
 
-**Kubernetes集群节点:** 兼容RHEL/CentOS/OracleLinux 7.4+以及RHEL/CentOS/RockyLinux/AlmaLinux/OracleLinux 8.4+ 以及 Ubuntu 18/20 LTS 版本，Minimal安装模式是推荐的方式，为了确保部署的顺利进行，应尽可能保证系统的干净。
+**Kubernetes集群节点:** 兼容麒麟V10 SP2版本，Minimal安装模式是推荐的方式，为了确保部署的顺利进行，应尽可能保证系统的干净。
 
 请阅读 **[部署指南](./BreezeManual-CN.md)** 获得更详细的Breeze使用操作指引。
 

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Breeze
 - Deploy a Production Ready Kubernetes Cluster with graphical interface
 
-[![pipeline status](https://gitlab.com/alanpeng/breeze/badges/master/pipeline.svg)](https://gitlab.com/alanpeng/breeze/-/commits/v1.21)
+[![pipeline status](https://gitlab.com/alanpeng/breeze/badges/master/pipeline.svg)](https://gitlab.com/alanpeng/breeze/-/commits/v1.23)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/wise2c-devops/breeze/blob/master/LICENSE)
 
 [English](./README.md) | [中文](./README-CN.md)
@@ -52,7 +52,7 @@ Project Breeze is an open source trusted solution allow you to create Kubernetes
 
 **Deploy server:** docker 1.13.1+ and docker-compose 1.12.0+ .
 
-**Kubernetes cluster server:** RHEL/CentOS/OracleLinux 7.4+ or RHEL/CentOS/RockyLinux/AlmaLinux/OracleLinux 8.4+ or Ubuntu 18/20 LTS is required and minimal installation mode is recommended.
+**Kubernetes cluster server:** RHEL/CentOS/OracleLinux 7.4+ or RHEL/CentOS/RockyLinux/AlmaLinux/OracleLinux/Anolis 8.4+ or Ubuntu 18/20 LTS is required and minimal installation mode is recommended. 
 
 Refer to **[User Guide](manual/BreezeManual.pdf)** for more details on how to use Breeze.
 

diff --git a/callback_plugins/log_back.py b/callback_plugins/log_back.py
@@ -23,7 +23,7 @@
 import time
 import json
 import http.client
-from collections import MutableMapping
+from _collections_abc import MutableMapping
 
 from ansible.module_utils._text import to_bytes
 from ansible.plugins.callback import CallbackBase

diff --git a/crio-playbook/version/ansible.cfg b/crio-playbook/version/ansible.cfg
@@ -0,0 +1,5 @@
+[defaults]
+inventory=hosts
+callback_plugins = ../../callback_plugins
+callback_whitelist = log_back
+retry_files_enabled = false