Skip to content

Commit e86d18b

Browse files
hswong3ihswong3i
committed
Merge branch 'release/20210313.1.1'
2 parents abcf54c + 2c64cc7 commit e86d18b

20 files changed

+124
-62
lines changed

‎.ansible-lint

-3
This file was deleted.

‎CHANGELOG.md

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

3-
## 4.7.0 - TBC
3+
## YYYYMMDD.Y.Z - TBC
44

55
### Major Changes
66

7+
## 20210313.1.1 - 2021-03-13
8+
9+
### Major Changes
10+
11+
- Bugfix [ansible-lint `namespace`](https://github.com/ansible-community/ansible-lint/pull/1451)
12+
- Bugfix [ansible-lint `no-handler`](https://github.com/ansible-community/ansible-lint/pull/1402)
13+
- Bugfix [ansible-lint `unnamed-task`](https://github.com/ansible-community/ansible-lint/pull/1413)
714
- Install Python package with `pipx`
815
- Simplify Python dependency with system packages
916
- Support RHEL 8 with Molecule

‎playbooks/00-hosts-install.yml

+16-8
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,42 @@
1818
remote_user: root
1919
become: true
2020
tasks:
21-
- include_role:
21+
- name: include role
22+
include_role:
2223
name: python
2324
tags: python
2425

25-
- include_role:
26+
- name: include role
27+
include_role:
2628
name: bootstrap
2729
tags: bootstrap
2830

29-
- include_role:
31+
- name: include role
32+
include_role:
3033
name: git
3134
tags: git
3235

33-
- include_role:
36+
- name: include role
37+
include_role:
3438
name: vim
3539
tags: vim
3640

37-
- include_role:
41+
- name: include role
42+
include_role:
3843
name: locales
3944
tags: locales
4045

41-
- include_role:
46+
- name: include role
47+
include_role:
4248
name: timezone
4349
tags: timezone
4450

45-
- include_role:
51+
- name: include role
52+
include_role:
4653
name: chrony
4754
tags: chrony
4855

49-
- include_role:
56+
- name: include role
57+
include_role:
5058
name: sshd
5159
tags: sshd

‎playbooks/10-kernel-install.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
remote_user: root
1919
become: true
2020
tasks:
21-
- include_role:
21+
- name: include role
22+
include_role:
2223
name: kernel
2324
tags: kernel

‎playbooks/20-ansible-install.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,17 @@
1818
remote_user: root
1919
become: true
2020
tasks:
21-
- include_role:
21+
- name: include role
22+
include_role:
2223
name: ansible
2324
tags: ansible
2425

25-
- include_role:
26+
- name: include role
27+
include_role:
2628
name: rclone
2729
tags: rclone
2830

29-
- include_role:
31+
- name: include role
32+
include_role:
3033
name: restic
3134
tags: restic

‎playbooks/30-cri_o-install.yml

+16-8
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,42 @@
1818
remote_user: root
1919
become: true
2020
tasks:
21-
- include_role:
21+
- name: include role
22+
include_role:
2223
name: cni_plugins
2324
tags: cni_plugins
2425

25-
- include_role:
26+
- name: include role
27+
include_role:
2628
name: cri_tools
2729
tags: cri_tools
2830

29-
- include_role:
31+
- name: include role
32+
include_role:
3033
name: containers_common
3134
tags: containers_common
3235

33-
- include_role:
36+
- name: include role
37+
include_role:
3438
name: runc
3539
tags: runc
3640

37-
- include_role:
41+
- name: include role
42+
include_role:
3843
name: crun
3944
tags: crun
4045

41-
- include_role:
46+
- name: include role
47+
include_role:
4248
name: kata
4349
tags: kata
4450

45-
- include_role:
51+
- name: include role
52+
include_role:
4653
name: conmon
4754
tags: conmon
4855

49-
- include_role:
56+
- name: include role
57+
include_role:
5058
name: cri_o
5159
tags: cri_o

‎playbooks/30-docker-install.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
remote_user: root
1919
become: true
2020
tasks:
21-
- include_role:
21+
- name: include role
22+
include_role:
2223
name: docker
2324
tags: docker

‎playbooks/30-etcd-install.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
remote_user: root
1919
become: true
2020
tasks:
21-
- include_role:
21+
- name: include role
22+
include_role:
2223
name: etcd
2324
tags: etcd
2425

‎playbooks/30-podman-install.yml

+14-7
Original file line numberDiff line numberDiff line change
@@ -18,30 +18,37 @@
1818
remote_user: root
1919
become: true
2020
tasks:
21-
- include_role:
21+
- name: include role
22+
include_role:
2223
name: cni_plugins
2324
tags: cni_plugins
2425

25-
- include_role:
26+
- name: include role
27+
include_role:
2628
name: containers_common
2729
tags: containers_common
2830

29-
- include_role:
31+
- name: include role
32+
include_role:
3033
name: runc
3134
tags: runc
3235

33-
- include_role:
36+
- name: include role
37+
include_role:
3438
name: conmon
3539
tags: conmon
3640

37-
- include_role:
41+
- name: include role
42+
include_role:
3843
name: skopeo
3944
tags: skopeo
4045

41-
- include_role:
46+
- name: include role
47+
include_role:
4248
name: buildah
4349
tags: buildah
4450

45-
- include_role:
51+
- name: include role
52+
include_role:
4653
name: podman
4754
tags: podman

‎playbooks/50-kubernetes-install.yml

+14-7
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,18 @@
1818
remote_user: root
1919
become: true
2020
tasks:
21-
- include_role:
21+
- name: include role
22+
include_role:
2223
name: kubectl
2324
tags: kubectl
2425

25-
- include_role:
26+
- name: include role
27+
include_role:
2628
name: kubeadm
2729
tags: kubeadm
2830

29-
- include_role:
31+
- name: include role
32+
include_role:
3033
name: kubelet
3134
tags: kubelet
3235

@@ -62,7 +65,8 @@
6265
changed_when: base64_decode_result is not succeeded
6366
tags: kube_master
6467

65-
- include_role:
68+
- name: include role
69+
include_role:
6670
name: kube_master
6771
tags: kube_master
6872

@@ -109,7 +113,8 @@
109113
ignore_errors: true
110114
tags: kube_node
111115

112-
- include_role:
116+
- name: include role
117+
include_role:
113118
name: kube_node
114119
vars:
115120
kubeadm_token: "{{ kubeadm_token_result.stdout }}"
@@ -119,11 +124,13 @@
119124
remote_user: root
120125
become: true
121126
tasks:
122-
- include_role:
127+
- name: include role
128+
include_role:
123129
name: operator_sdk
124130
tags: operator_sdk
125131

126-
- include_role:
132+
- name: include role
133+
include_role:
127134
name: kubectl
128135
tags: kubectl
129136

‎playbooks/60-kubernetes_flannel-install.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
remote_user: root
1919
become: true
2020
tasks:
21-
- include_role:
21+
- name: include role
22+
include_role:
2223
name: kubernetes_addon_manager
2324
tags: kubernetes_addon_manager
2425

25-
- include_role:
26+
- name: include role
27+
include_role:
2628
name: kubernetes_flannel
2729
tags: kubernetes_flannel

‎playbooks/60-kubernetes_weave-install.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
remote_user: root
1919
become: true
2020
tasks:
21-
- include_role:
21+
- name: include role
22+
include_role:
2223
name: kubernetes_addon_manager
2324
tags: kubernetes_addon_manager
2425

25-
- include_role:
26+
- name: include role
27+
include_role:
2628
name: kubernetes_weave
2729
tags: kubernetes_weave

‎playbooks/70-kubernetes_csi_cephfs-install.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
remote_user: root
2323
become: true
2424
tasks:
25-
- include_role:
25+
- name: include role
26+
include_role:
2627
name: ceph_common
2728
tags: ceph_common
2829

@@ -41,11 +42,13 @@
4142
changed_when: ceph_client_admin_result is not succeeded
4243
tags: kubernetes_csi_cephfs
4344

44-
- include_role:
45+
- name: include role
46+
include_role:
4547
name: kubernetes_addon_manager
4648
tags: kubernetes_addon_manager
4749

48-
- include_role:
50+
- name: include role
51+
include_role:
4952
name: kubernetes_csi_cephfs
5053
vars:
5154
csi_cephfs_admin_secret: "{{ ceph_client_admin_result.stdout }}"

‎playbooks/70-kubernetes_csi_hostpath-install.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@
2222
remote_user: root
2323
become: true
2424
tasks:
25-
- include_role:
25+
- name: include role
26+
include_role:
2627
name: kubernetes_addon_manager
2728
tags: kubernetes_addon_manager
2829

29-
- include_role:
30+
- name: include role
31+
include_role:
3032
name: kubernetes_csi_hostpath
3133
tags: kubernetes_csi_hostpath

‎playbooks/70-kubernetes_csi_rbd-install.yml

+6-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
remote_user: root
2323
become: true
2424
tasks:
25-
- include_role:
25+
- name: include role
26+
include_role:
2627
name: ceph_common
2728
tags: ceph_common
2829

@@ -41,11 +42,13 @@
4142
changed_when: ceph_client_admin_result is not succeeded
4243
tags: kubernetes_csi_rbd
4344

44-
- include_role:
45+
- name: include role
46+
include_role:
4547
name: kubernetes_addon_manager
4648
tags: kubernetes_addon_manager
4749

48-
- include_role:
50+
- name: include role
51+
include_role:
4952
name: kubernetes_csi_rbd
5053
vars:
5154
csi_rbd_admin_secret: "{{ ceph_client_admin_result.stdout }}"

‎playbooks/80-kubernetes_cert_manager-install.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@
1818
remote_user: root
1919
become: true
2020
tasks:
21-
- include_role:
21+
- name: include role
22+
include_role:
2223
name: kubernetes_addon_manager
2324
tags: kubernetes_addon_manager
2425

25-
- include_role:
26+
- name: include role
27+
include_role:
2628
name: kubernetes_cert_manager
2729
tags: kubernetes_cert_manager

0 commit comments

Comments
 (0)