Skip to content

Commit 1ab77b0

Browse files
hswong3ihswong3i
committed
Merge branch 'release/4.4.0'
2 parents 159e173 + 1777056 commit 1ab77b0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+342
-118
lines changed

‎.gitmodules

+15-15
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
url = https://github.com/alvistack/ansible-role-conmon.git
4848
branch = develop
4949
[submodule "roles/containers_common"]
50-
path = roles/containers_common
51-
url = https://github.com/alvistack/ansible-role-containers_common.git
52-
branch = develop
50+
path = roles/containers_common
51+
url = https://github.com/alvistack/ansible-role-containers_common.git
52+
branch = develop
5353
[submodule "roles/cri_o"]
5454
path = roles/cri_o
5555
url = https://github.com/alvistack/ansible-role-cri_o.git
@@ -58,6 +58,10 @@
5858
path = roles/cri_tools
5959
url = https://github.com/alvistack/ansible-role-cri_tools.git
6060
branch = develop
61+
[submodule "roles/crun"]
62+
path = roles/crun
63+
url = https://github.com/alvistack/ansible-role-crun.git
64+
branch = develop
6165
[submodule "roles/etcd"]
6266
path = roles/etcd
6367
url = https://github.com/alvistack/ansible-role-etcd.git
@@ -66,14 +70,18 @@
6670
path = roles/git
6771
url = https://github.com/alvistack/ansible-role-git.git
6872
branch = develop
69-
[submodule "roles/golang"]
70-
path = roles/golang
71-
url = https://github.com/alvistack/ansible-role-golang.git
72-
branch = develop
7373
[submodule "roles/kernel"]
7474
path = roles/kernel
7575
url = https://github.com/alvistack/ansible-role-kernel.git
7676
branch = develop
77+
[submodule "roles/kube_master"]
78+
path = roles/kube_master
79+
url = https://github.com/alvistack/ansible-role-kube_master.git
80+
branch = develop
81+
[submodule "roles/kube_node"]
82+
path = roles/kube_node
83+
url = https://github.com/alvistack/ansible-role-kube_node.git
84+
branch = develop
7785
[submodule "roles/kubeadm"]
7886
path = roles/kubeadm
7987
url = https://github.com/alvistack/ansible-role-kubeadm.git
@@ -86,14 +94,6 @@
8694
path = roles/kubelet
8795
url = https://github.com/alvistack/ansible-role-kubelet.git
8896
branch = develop
89-
[submodule "roles/kube_master"]
90-
path = roles/kube_master
91-
url = https://github.com/alvistack/ansible-role-kube_master.git
92-
branch = develop
93-
[submodule "roles/kube_node"]
94-
path = roles/kube_node
95-
url = https://github.com/alvistack/ansible-role-kube_node.git
96-
branch = develop
9797
[submodule "roles/kubernetes_addon_manager"]
9898
path = roles/kubernetes_addon_manager
9999
url = https://github.com/alvistack/ansible-role-kubernetes_addon_manager.git

‎.travis.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,15 @@ before_install:
4747
4848
install:
4949
- |
50-
git submodule init
51-
git submodule sync
52-
git submodule update
50+
export COLLECTION=$(echo $TRAVIS_REPO_SLUG | sed 's/^.*\/ansible-collection-/\//g')
51+
mkdir -p $HOME/.ansible/roles
52+
mkdir -p $HOME/.ansible/collections/alvistack
53+
ln -s $TRAVIS_BUILD_DIR $HOME/.ansible/collections/alvistack/$COLLECTION
54+
molecule dependency
5355
5456
script:
5557
- |
5658
source ./scripts/run-tests.sh \
57-
&& sudo -E molecule dependency -s $MOLECULE_SCENARIO_NAME \
5859
&& sudo -E molecule lint -s $MOLECULE_SCENARIO_NAME \
5960
&& sudo -E molecule syntax -s $MOLECULE_SCENARIO_NAME \
6061
&& sudo -E molecule converge -s $MOLECULE_SCENARIO_NAME \

‎CHANGELOG.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
# Ansible Collection for Kubernetes
22

3-
## 4.4.0 - TBC
3+
## 4.5.0 - TBC
44

55
### Major Changes
66

7+
## 4.4.0 - 2020-06-04
8+
9+
### Major Changes
10+
11+
- Install with static binary archive
12+
- Default with `crun`
713
- Support Fedora 32
814
- Support Debian 10
915
- Support CephFS creation

‎README.md

-7
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ This playbook was designed for:
2121
- Debian 10
2222
- Fedora 32
2323

24-
### Debian 10
25-
26-
CRI-O v1.18.0 is currently failed on Debian 10 default kernel, due to missing `CONFIG_CGROUP_HUGETLB` support for cgroup (see <https://github.com/cri-o/cri-o/issues/3717>), with solution:
27-
28-
- Upgrade CRI-O into branch `release-1.18` (see <https://github.com/cri-o/cri-o/commit/ea79742604aec07fad891bd53f4acaaec4355399>), or
29-
- Upgrade kernel with Ubuntu Mainline Kernel PPA and reboot (see <https://kernel.ubuntu.com/~kernel-ppa/mainline/v5.6.11/>)
30-
3124
### Fedora 32
3225

3326
Our default Ceph 15.2 is not supported by Fedora 32 (only Ceph 14.2), with solution:

‎ansible-galaxy-requirements.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
3+
# (c) Wong Hoi Sing Edison <[email protected]>
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
collections:
18+
- name: community.kubernetes
19+
src: https://galaxy.ansible.com
20+
version: ">=0.11.0,<1.0.0"
21+
22+
- name: operator_sdk.util
23+
src: https://galaxy.ansible.com
24+
version: ">=0.0.0,<1.0.0"

‎inventory/default/group_vars/all/00-defaults.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ ceph_release: "15.2"
1919
kernel_release: "mainline"
2020

2121
# version
22-
cri_o_version: "v1.18.0"
23-
kubernetes_version: "v1.18.2"
22+
crictl_version: "v1.18.0"
23+
cri_o_version: "v1.18.1"
24+
kubernetes_version: "v1.18.3"
2425

2526
# ceph_common
2627
ceph_fsid: "{{ hostvars[groups['ceph_mon'][0]].ansible_machine_id | to_uuid }}"

‎molecule/centos-7/molecule.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ lint: |
5050
dependency:
5151
name: galaxy
5252
options:
53-
role-file: ansible-role-requirements.yml
54-
roles-path: ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
53+
role-file: ansible-galaxy-requirements.yml
54+
roles-path: ${HOME}/.ansible/roles
55+
requirements-file: ansible-galaxy-requirements.yml
56+
collections-path: ${HOME}/.ansible/collections
5557
ignore-errors: true
5658
provisioner:
5759
name: ansible

‎molecule/centos-8/molecule.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ lint: |
5050
dependency:
5151
name: galaxy
5252
options:
53-
role-file: ansible-role-requirements.yml
54-
roles-path: ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
53+
role-file: ansible-galaxy-requirements.yml
54+
roles-path: ${HOME}/.ansible/roles
55+
requirements-file: ansible-galaxy-requirements.yml
56+
collections-path: ${HOME}/.ansible/collections
5557
ignore-errors: true
5658
provisioner:
5759
name: ansible

‎molecule/debian-10/molecule.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ lint: |
5050
dependency:
5151
name: galaxy
5252
options:
53-
role-file: ansible-role-requirements.yml
54-
roles-path: ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
53+
role-file: ansible-galaxy-requirements.yml
54+
roles-path: ${HOME}/.ansible/roles
55+
requirements-file: ansible-galaxy-requirements.yml
56+
collections-path: ${HOME}/.ansible/collections
5557
ignore-errors: true
5658
provisioner:
5759
name: ansible

‎molecule/default/molecule.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,15 @@ lint: |
4040
dependency:
4141
name: galaxy
4242
options:
43-
role-file: ansible-role-requirements.yml
44-
roles-path: ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
43+
role-file: ansible-galaxy-requirements.yml
44+
roles-path: ${HOME}/.ansible/roles
45+
requirements-file: ansible-galaxy-requirements.yml
46+
collections-path: ${HOME}/.ansible/collections
4547
ignore-errors: true
4648
provisioner:
4749
name: ansible
4850
env:
49-
ANSIBLE_ROLES_PATH: ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
51+
ANSIBLE_ROLES_PATH: ${HOME}/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
5052
config_options:
5153
defaults:
5254
forks: 20

‎molecule/default/prepare.yml

+3
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,23 @@
3030
raw: |
3131
set -ex
3232
setenforce 0
33+
sed -i 's/^SELINUX=.*$/SELINUX=permissive/g' /etc/selinux/config
3334
changed_when: false
3435
ignore_errors: true
3536

3637
- name: systemctl stop firewalld.service
3738
raw: |
3839
set -ex
3940
systemctl stop firewalld.service
41+
systemctl disable firewalld.service
4042
changed_when: false
4143
ignore_errors: true
4244

4345
- name: systemctl stop ufw.service
4446
raw: |
4547
set -ex
4648
systemctl stop ufw.service
49+
systemctl disable ufw.service
4750
changed_when: false
4851
ignore_errors: true
4952

‎molecule/fedora-32/molecule.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ lint: |
5050
dependency:
5151
name: galaxy
5252
options:
53-
role-file: ansible-role-requirements.yml
54-
roles-path: ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
53+
role-file: ansible-galaxy-requirements.yml
54+
roles-path: ${HOME}/.ansible/roles
55+
requirements-file: ansible-galaxy-requirements.yml
56+
collections-path: ${HOME}/.ansible/collections
5557
ignore-errors: true
5658
provisioner:
5759
name: ansible

‎molecule/redhat-7/molecule.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ lint: |
5050
dependency:
5151
name: galaxy
5252
options:
53-
role-file: ansible-role-requirements.yml
54-
roles-path: ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
53+
role-file: ansible-galaxy-requirements.yml
54+
roles-path: ${HOME}/.ansible/roles
55+
requirements-file: ansible-galaxy-requirements.yml
56+
collections-path: ${HOME}/.ansible/collections
5557
ignore-errors: true
5658
provisioner:
5759
name: ansible

‎molecule/redhat-8/molecule.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ lint: |
5050
dependency:
5151
name: galaxy
5252
options:
53-
role-file: ansible-role-requirements.yml
54-
roles-path: ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
53+
role-file: ansible-galaxy-requirements.yml
54+
roles-path: ${HOME}/.ansible/roles
55+
requirements-file: ansible-galaxy-requirements.yml
56+
collections-path: ${HOME}/.ansible/collections
5557
ignore-errors: true
5658
provisioner:
5759
name: ansible

‎molecule/suse-15/molecule.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ lint: |
5050
dependency:
5151
name: galaxy
5252
options:
53-
role-file: ansible-role-requirements.yml
54-
roles-path: ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
53+
role-file: ansible-galaxy-requirements.yml
54+
roles-path: ${HOME}/.ansible/roles
55+
requirements-file: ansible-galaxy-requirements.yml
56+
collections-path: ${HOME}/.ansible/collections
5557
ignore-errors: true
5658
provisioner:
5759
name: ansible

‎molecule/ubuntu-18.04/molecule.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ lint: |
5050
dependency:
5151
name: galaxy
5252
options:
53-
role-file: ansible-role-requirements.yml
54-
roles-path: ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
53+
role-file: ansible-galaxy-requirements.yml
54+
roles-path: ${HOME}/.ansible/roles
55+
requirements-file: ansible-galaxy-requirements.yml
56+
collections-path: ${HOME}/.ansible/collections
5557
ignore-errors: true
5658
provisioner:
5759
name: ansible

‎molecule/ubuntu-19.10/molecule.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ lint: |
5050
dependency:
5151
name: galaxy
5252
options:
53-
role-file: ansible-role-requirements.yml
54-
roles-path: ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
53+
role-file: ansible-galaxy-requirements.yml
54+
roles-path: ${HOME}/.ansible/roles
55+
requirements-file: ansible-galaxy-requirements.yml
56+
collections-path: ${HOME}/.ansible/collections
5557
ignore-errors: true
5658
provisioner:
5759
name: ansible

‎molecule/ubuntu-20.04/molecule.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ lint: |
5050
dependency:
5151
name: galaxy
5252
options:
53-
role-file: ansible-role-requirements.yml
54-
roles-path: ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
53+
role-file: ansible-galaxy-requirements.yml
54+
roles-path: ${HOME}/.ansible/roles
55+
requirements-file: ansible-galaxy-requirements.yml
56+
collections-path: ${HOME}/.ansible/collections
5557
ignore-errors: true
5658
provisioner:
5759
name: ansible

‎playbooks/ansible-install.yml

+3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@
2020
tasks:
2121
- include_role:
2222
name: ansible
23+
tags: ansible
2324

2425
- include_role:
2526
name: rclone
27+
tags: rclone
2628

2729
- include_role:
2830
name: restic
31+
tags: restic

0 commit comments

Comments
 (0)