diff --git a/README.md b/README.md index 9032c4b2e..a8301c01b 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,7 @@ vagrant up - **Kylin Linux Advanced Server V10** (experimental: see [kylin linux notes](docs/kylinlinux.md)) - **Amazon Linux 2** (experimental: see [amazon linux notes](docs/amazonlinux.md)) - **UOS Linux** (experimental: see [uos linux notes](docs/uoslinux.md)) +- **openEuler** (experimental: see [openEuler notes](docs/openeuler.md)) Note: Upstart/SysV init based OS types are not supported. diff --git a/docs/_sidebar.md b/docs/_sidebar.md index b269bea02..6942bcf0a 100644 --- a/docs/_sidebar.md +++ b/docs/_sidebar.md @@ -38,6 +38,7 @@ * [Kylin Linux Advanced Server V10](docs/kylinlinux.md) * [Amazon Linux 2](docs/amazonlinux.md) * [UOS Linux](docs/uoslinux.md) + * [openEuler notes](docs/openeuler.md)) * CRI * [Containerd](docs/containerd.md) * [Docker](docs/docker.md) diff --git a/docs/openeuler.md b/docs/openeuler.md new file mode 100644 index 000000000..41f368655 --- /dev/null +++ b/docs/openeuler.md @@ -0,0 +1,11 @@ +# OpenEuler + +[OpenEuler](https://www.openeuler.org/en/) Linux currently only supports the containerd runtime. + +**Note:** that OpenEuler Linux is not currently covered in kubespray CI and +support for it is currently considered experimental. + +At present, only `openEuler 22.03 LTS` has been adapted, which can support the deployment of aarch64 and x86_64 platforms. + +There are no special considerations for using OpenEuler Linux as the target OS +for Kubespray deployments. diff --git a/roles/bootstrap-os/tasks/main.yml b/roles/bootstrap-os/tasks/main.yml index fbd15713a..853ce095f 100644 --- a/roles/bootstrap-os/tasks/main.yml +++ b/roles/bootstrap-os/tasks/main.yml @@ -7,7 +7,7 @@ check_mode: false - include_tasks: bootstrap-centos.yml - when: '''ID="centos"'' in os_release.stdout_lines or ''ID="ol"'' in os_release.stdout_lines or ''ID="almalinux"'' in os_release.stdout_lines or ''ID="rocky"'' in os_release.stdout_lines or ''ID="kylin"'' in os_release.stdout_lines or ''ID="uos"'' in os_release.stdout_lines' + when: '''ID="centos"'' in os_release.stdout_lines or ''ID="ol"'' in os_release.stdout_lines or ''ID="almalinux"'' in os_release.stdout_lines or ''ID="rocky"'' in os_release.stdout_lines or ''ID="kylin"'' in os_release.stdout_lines or ''ID="uos"'' in os_release.stdout_lines or ''ID="openEuler"'' in os_release.stdout_lines' - include_tasks: bootstrap-amazon.yml when: '''ID="amzn"'' in os_release.stdout_lines' diff --git a/roles/container-engine/containerd/tasks/main.yml b/roles/container-engine/containerd/tasks/main.yml index 50efd4add..03b9668d9 100644 --- a/roles/container-engine/containerd/tasks/main.yml +++ b/roles/container-engine/containerd/tasks/main.yml @@ -3,7 +3,7 @@ fail: msg: "{{ ansible_distribution }} is not supported by containerd." when: - - ansible_distribution not in ["CentOS", "OracleLinux", "RedHat", "Ubuntu", "Debian", "Fedora", "AlmaLinux", "Rocky", "Amazon", "Flatcar", "Flatcar Container Linux by Kinvolk", "Suse", "openSUSE Leap", "openSUSE Tumbleweed", "Kylin Linux Advanced Server", "UnionTech"] + - ansible_distribution not in ["CentOS", "OracleLinux", "RedHat", "Ubuntu", "Debian", "Fedora", "AlmaLinux", "Rocky", "Amazon", "Flatcar", "Flatcar Container Linux by Kinvolk", "Suse", "openSUSE Leap", "openSUSE Tumbleweed", "Kylin Linux Advanced Server", "UnionTech", "openEuler"] - name: containerd | Remove any package manager controlled containerd package package: diff --git a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml index 4705be9c6..1ff163f3b 100644 --- a/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml +++ b/roles/kubernetes/preinstall/tasks/0020-verify-settings.yml @@ -24,7 +24,7 @@ - name: Stop if unknown OS assert: - that: ansible_distribution in ['RedHat', 'CentOS', 'Fedora', 'Ubuntu', 'Debian', 'Flatcar', 'Flatcar Container Linux by Kinvolk', 'Suse', 'openSUSE Leap', 'openSUSE Tumbleweed', 'ClearLinux', 'OracleLinux', 'AlmaLinux', 'Rocky', 'Amazon', 'Kylin Linux Advanced Server', 'UnionTech'] + that: ansible_distribution in ['RedHat', 'CentOS', 'Fedora', 'Ubuntu', 'Debian', 'Flatcar', 'Flatcar Container Linux by Kinvolk', 'Suse', 'openSUSE Leap', 'openSUSE Tumbleweed', 'ClearLinux', 'OracleLinux', 'AlmaLinux', 'Rocky', 'Amazon', 'Kylin Linux Advanced Server', 'UnionTech', 'openEuler'] msg: "{{ ansible_distribution }} is not a known OS" when: not ignore_assert_errors