Skip to content

Commit dd40976

Browse files
hswong3ihswong3i
committed
Merge branch 'release/4.6.0'
2 parents f0b2265 + 02f34e2 commit dd40976

Some content is hidden

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

69 files changed

+113
-768
lines changed

‎CHANGELOG.md

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

3-
## 4.6.0 - TBC
3+
## 4.7.0 - TBC
44

55
### Major Changes
66

7+
## 4.6.0 - 2020-12-28
8+
9+
### Major Changes
10+
11+
- Simplify Molecule scenario for vagrant-libvirt
712
- Migrate from Travis CI to GitLab CI
813
- Split Ceph related to `alvistack/ansible-collection-ceph`
914
- Support Fedora 33

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

+1-71
Original file line numberDiff line numberDiff line change
@@ -14,42 +14,9 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616

17-
# kernel
18-
kernel_release: "mainline"
19-
2017
# etcd
2118
etcd_version: "v3.4.13"
22-
etcd_cert_file: "/etc/etcd/pki/server.crt"
23-
etcd_key_file: "/etc/etcd/pki/server.key"
2419
etcd_trusted_ca_file: "/etc/etcd/pki/ca.crt"
25-
etcd_peer_cert_file: "/etc/etcd/pki/peer.crt"
26-
etcd_peer_key_file: "/etc/etcd/pki/peer.key"
27-
etcd_peer_trusted_ca_file: "/etc/etcd/pki/ca.crt"
28-
etcd_listen_peer_urls: "https://{{ ansible_default_ipv4.address }}:2380,https://127.0.0.1:2380"
29-
etcd_listen_client_urls: "https://{{ ansible_default_ipv4.address }}:2379,https://127.0.0.1:2379"
30-
etcd_initial_advertise_peer_urls: "https://{{ ansible_default_ipv4.address }}:2380"
31-
etcd_initial_cluster: >-
32-
{%- set _ns = namespace() -%}
33-
{%- set _ns._params = [] -%}
34-
{%- for host in groups['etcd'] -%}
35-
{%- set _ns._params = _ns._params + [host + "=https://" + hostvars[host].ansible_default_ipv4.address + ":2380"] -%}
36-
{%- endfor -%}
37-
{{ _ns._params | join(',') }}
38-
etcd_advertise_client_urls: "https://{{ ansible_default_ipv4.address }}:2379"
39-
etcd_csr_subject_alt_name: >-
40-
{%- set _ns = namespace() -%}
41-
{%- set _ns._params = ["DNS:localhost", "IP:127.0.0.1"] -%}
42-
{%- for host in groups['etcd'] -%}
43-
{%- set _ns._params = _ns._params + ["DNS:" + host, "IP:" + hostvars[host].ansible_default_ipv4.address] -%}
44-
{%- endfor -%}
45-
{{ _ns._params }}
46-
etcd_peer_csr_subject_alt_name: >-
47-
{%- set _ns = namespace() -%}
48-
{%- set _ns._params = ["DNS:localhost", "IP:127.0.0.1"] -%}
49-
{%- for host in groups['etcd'] -%}
50-
{%- set _ns._params = _ns._params + ["DNS:" + host, "IP:" + hostvars[host].ansible_default_ipv4.address] -%}
51-
{%- endfor -%}
52-
{{ _ns._params }}
5320

5421
# cri_tools
5522
crictl_version: "v1.18.0"
@@ -58,7 +25,7 @@ crictl_version: "v1.18.0"
5825
cri_o_version: "v1.18.4"
5926

6027
# kube_master
61-
kubernetes_version: "v1.18.13"
28+
kubernetes_version: "v1.18.14"
6229
kubernetes_cluster_name: "{{ hostvars[groups['kube_master'][0]].ansible_machine_id | to_uuid }}"
6330
kubernetes_etcd:
6431
external:
@@ -72,8 +39,6 @@ kubernetes_etcd:
7239
caFile: "/etc/kubernetes/pki/etcd/ca.crt"
7340
certFile: "/etc/kubernetes/pki/apiserver-etcd-client.crt"
7441
keyFile: "/etc/kubernetes/pki/apiserver-etcd-client.key"
75-
kubelet_node_ip: "{{ ansible_default_ipv4.address }}"
76-
kube_apiserver_advertise_address: "{{ ansible_default_ipv4.address }}"
7742
kube_apiserver_bind_port: "6443"
7843
kube_apiserver_endpoint: "{{ hostvars[groups['kube_master'][0]].ansible_default_ipv4.address }}:{{ kube_apiserver_bind_port }}"
7944
kube_apiserver_csr_common_name: "{{ groups['kube_master'][0] }}"
@@ -87,38 +52,3 @@ kube_apiserver_csr_subject_alt_name: >-
8752
8853
# ceph_common
8954
ceph_release: "15.2"
90-
ceph_fsid: "{{ hostvars[groups['ceph_mon'][0]].ansible_machine_id | to_uuid }}"
91-
ceph_mon_initial_members: >-
92-
{%- set _ns = namespace() -%}
93-
{%- set _ns._params = [] -%}
94-
{%- for host in groups['ceph_mon'] -%}
95-
{%- set _ns._params = _ns._params + [host] -%}
96-
{%- endfor -%}
97-
{{ _ns._params | join(',') }}
98-
ceph_mon_host: >-
99-
{%- set _ns = namespace() -%}
100-
{%- set _ns._params = [] -%}
101-
{%- for host in groups['ceph_mon'] -%}
102-
{%- set _ns._params = _ns._params + [hostvars[host].ansible_default_ipv4.address] -%}
103-
{%- endfor -%}
104-
{{ _ns._params | join(',') }}
105-
ceph_public_network: "{{ (ansible_default_ipv4.network + '/' + ansible_default_ipv4.netmask) | ipaddr('net') }}"
106-
ceph_cluster_network: "{{ (ansible_default_ipv4.network + '/' + ansible_default_ipv4.netmask) | ipaddr('net') }}"
107-
108-
# kubernetes_csi_cephfs
109-
csi_cephfs_monitors: >-
110-
{%- set _ns = namespace() -%}
111-
{%- set _ns._params = [] -%}
112-
{%- for host in groups['ceph_mon'] -%}
113-
{%- set _ns._params = _ns._params + [hostvars[host].ansible_default_ipv4.address + ":6789"] -%}
114-
{%- endfor -%}
115-
{{ _ns._params | join(',') }}
116-
117-
# kubernetes_csi_rbd
118-
csi_rbd_monitors: >-
119-
{%- set _ns = namespace() -%}
120-
{%- set _ns._params = [] -%}
121-
{%- for host in groups['ceph_mon'] -%}
122-
{%- set _ns._params = _ns._params + [hostvars[host].ansible_default_ipv4.address + ":6789"] -%}
123-
{%- endfor -%}
124-
{{ _ns._params | join(',') }}

‎molecule/centos-7/group_vars/all/99-molecule.yml

-51
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,3 @@
1313
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
16-
17-
# etcd
18-
etcd_listen_peer_urls: "https://{{ ansible_eth1.ipv4.address }}:2380,https://127.0.0.1:2380"
19-
etcd_listen_client_urls: "https://{{ ansible_eth1.ipv4.address }}:2379,https://127.0.0.1:2379"
20-
etcd_initial_advertise_peer_urls: "https://{{ ansible_eth1.ipv4.address }}:2380"
21-
etcd_initial_cluster: >-
22-
{%- set _ns = namespace() -%}
23-
{%- set _ns._params = [] -%}
24-
{%- for host in groups['etcd'] -%}
25-
{%- set _ns._params = _ns._params + [host + "=https://" + hostvars[host].ansible_eth1.ipv4.address + ":2380"] -%}
26-
{%- endfor -%}
27-
{{ _ns._params | join(',') }}
28-
etcd_advertise_client_urls: "https://{{ ansible_eth1.ipv4.address }}:2379"
29-
etcd_csr_subject_alt_name: >-
30-
{%- set _ns = namespace() -%}
31-
{%- set _ns._params = ["DNS:localhost", "IP:127.0.0.1"] -%}
32-
{%- for host in groups['etcd'] -%}
33-
{%- set _ns._params = _ns._params + ["DNS:" + host, "IP:" + hostvars[host].ansible_eth1.ipv4.address] -%}
34-
{%- endfor -%}
35-
{{ _ns._params }}
36-
etcd_peer_csr_subject_alt_name: >-
37-
{%- set _ns = namespace() -%}
38-
{%- set _ns._params = ["DNS:localhost", "IP:127.0.0.1"] -%}
39-
{%- for host in groups['etcd'] -%}
40-
{%- set _ns._params = _ns._params + ["DNS:" + host, "IP:" + hostvars[host].ansible_eth1.ipv4.address] -%}
41-
{%- endfor -%}
42-
{{ _ns._params }}
43-
44-
# kube_master
45-
kubernetes_etcd:
46-
external:
47-
endpoints: >-
48-
{%- set _ns = namespace() -%}
49-
{%- set _ns._params = [] -%}
50-
{%- for host in groups['etcd'] -%}
51-
{%- set _ns._params = _ns._params + ["https://" + hostvars[host].ansible_eth1.ipv4.address + ":2379"] -%}
52-
{%- endfor -%}
53-
{{ _ns._params }}
54-
caFile: "/etc/kubernetes/pki/etcd/ca.crt"
55-
certFile: "/etc/kubernetes/pki/apiserver-etcd-client.crt"
56-
keyFile: "/etc/kubernetes/pki/apiserver-etcd-client.key"
57-
kubelet_node_ip: "{{ ansible_eth1.ipv4.address }}"
58-
kube_apiserver_advertise_address: "{{ ansible_eth1.ipv4.address }}"
59-
kube_apiserver_endpoint: "{{ hostvars[groups['kube_master'][0]].ansible_eth1.ipv4.address }}:{{ kube_apiserver_bind_port }}"
60-
kube_apiserver_csr_subject_alt_name: >-
61-
{%- set _ns = namespace() -%}
62-
{%- set _ns._params = ["DNS:localhost", "IP:127.0.0.1"] -%}
63-
{%- for host in groups['kube_master'] -%}
64-
{%- set _ns._params = _ns._params + ["DNS:" + host, "IP:" + hostvars[host].ansible_eth1.ipv4.address] -%}
65-
{%- endfor -%}
66-
{{ _ns._params }}

‎molecule/centos-7/molecule.yml

+4-12
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,11 @@ platforms:
2323
box: generic/centos7
2424
cpu: 2
2525
memory: 4096
26-
interfaces:
27-
- auto_config: true
28-
network_name: private_network
29-
type: dhcp
30-
provider_options:
31-
cpu_mode: "'host-model'"
32-
disk_bus: "'virtio'"
33-
driver: "'kvm'"
34-
nested: "'true'"
35-
nic_model_type: "'virtio'"
36-
video_type: "'virtio'"
37-
volume_cache: "'writeback'"
3826
provider_raw_config_args:
27+
- "disk_bus = 'virtio'"
28+
- "nic_model_type = 'virtio'"
29+
- "video_type = 'virtio'"
30+
- "volume_cache = 'writeback'"
3931
- "storage :file, bus: 'virtio', cache: 'writeback'"
4032
groups:
4133
- ansible

‎molecule/centos-8/group_vars/all/99-molecule.yml

-51
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,3 @@
1313
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
16-
17-
# etcd
18-
etcd_listen_peer_urls: "https://{{ ansible_eth1.ipv4.address }}:2380,https://127.0.0.1:2380"
19-
etcd_listen_client_urls: "https://{{ ansible_eth1.ipv4.address }}:2379,https://127.0.0.1:2379"
20-
etcd_initial_advertise_peer_urls: "https://{{ ansible_eth1.ipv4.address }}:2380"
21-
etcd_initial_cluster: >-
22-
{%- set _ns = namespace() -%}
23-
{%- set _ns._params = [] -%}
24-
{%- for host in groups['etcd'] -%}
25-
{%- set _ns._params = _ns._params + [host + "=https://" + hostvars[host].ansible_eth1.ipv4.address + ":2380"] -%}
26-
{%- endfor -%}
27-
{{ _ns._params | join(',') }}
28-
etcd_advertise_client_urls: "https://{{ ansible_eth1.ipv4.address }}:2379"
29-
etcd_csr_subject_alt_name: >-
30-
{%- set _ns = namespace() -%}
31-
{%- set _ns._params = ["DNS:localhost", "IP:127.0.0.1"] -%}
32-
{%- for host in groups['etcd'] -%}
33-
{%- set _ns._params = _ns._params + ["DNS:" + host, "IP:" + hostvars[host].ansible_eth1.ipv4.address] -%}
34-
{%- endfor -%}
35-
{{ _ns._params }}
36-
etcd_peer_csr_subject_alt_name: >-
37-
{%- set _ns = namespace() -%}
38-
{%- set _ns._params = ["DNS:localhost", "IP:127.0.0.1"] -%}
39-
{%- for host in groups['etcd'] -%}
40-
{%- set _ns._params = _ns._params + ["DNS:" + host, "IP:" + hostvars[host].ansible_eth1.ipv4.address] -%}
41-
{%- endfor -%}
42-
{{ _ns._params }}
43-
44-
# kube_master
45-
kubernetes_etcd:
46-
external:
47-
endpoints: >-
48-
{%- set _ns = namespace() -%}
49-
{%- set _ns._params = [] -%}
50-
{%- for host in groups['etcd'] -%}
51-
{%- set _ns._params = _ns._params + ["https://" + hostvars[host].ansible_eth1.ipv4.address + ":2379"] -%}
52-
{%- endfor -%}
53-
{{ _ns._params }}
54-
caFile: "/etc/kubernetes/pki/etcd/ca.crt"
55-
certFile: "/etc/kubernetes/pki/apiserver-etcd-client.crt"
56-
keyFile: "/etc/kubernetes/pki/apiserver-etcd-client.key"
57-
kubelet_node_ip: "{{ ansible_eth1.ipv4.address }}"
58-
kube_apiserver_advertise_address: "{{ ansible_eth1.ipv4.address }}"
59-
kube_apiserver_endpoint: "{{ hostvars[groups['kube_master'][0]].ansible_eth1.ipv4.address }}:{{ kube_apiserver_bind_port }}"
60-
kube_apiserver_csr_subject_alt_name: >-
61-
{%- set _ns = namespace() -%}
62-
{%- set _ns._params = ["DNS:localhost", "IP:127.0.0.1"] -%}
63-
{%- for host in groups['kube_master'] -%}
64-
{%- set _ns._params = _ns._params + ["DNS:" + host, "IP:" + hostvars[host].ansible_eth1.ipv4.address] -%}
65-
{%- endfor -%}
66-
{{ _ns._params }}

‎molecule/centos-8/molecule.yml

+4-12
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,11 @@ platforms:
2323
box: generic/centos8
2424
cpu: 2
2525
memory: 4096
26-
interfaces:
27-
- auto_config: true
28-
network_name: private_network
29-
type: dhcp
30-
provider_options:
31-
cpu_mode: "'host-model'"
32-
disk_bus: "'virtio'"
33-
driver: "'kvm'"
34-
nested: "'true'"
35-
nic_model_type: "'virtio'"
36-
video_type: "'virtio'"
37-
volume_cache: "'writeback'"
3826
provider_raw_config_args:
27+
- "disk_bus = 'virtio'"
28+
- "nic_model_type = 'virtio'"
29+
- "video_type = 'virtio'"
30+
- "volume_cache = 'writeback'"
3931
- "storage :file, bus: 'virtio', cache: 'writeback'"
4032
groups:
4133
- ansible

‎molecule/debian-10/group_vars/all/99-molecule.yml

-51
Original file line numberDiff line numberDiff line change
@@ -13,54 +13,3 @@
1313
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
16-
17-
# etcd
18-
etcd_listen_peer_urls: "https://{{ ansible_eth1.ipv4.address }}:2380,https://127.0.0.1:2380"
19-
etcd_listen_client_urls: "https://{{ ansible_eth1.ipv4.address }}:2379,https://127.0.0.1:2379"
20-
etcd_initial_advertise_peer_urls: "https://{{ ansible_eth1.ipv4.address }}:2380"
21-
etcd_initial_cluster: >-
22-
{%- set _ns = namespace() -%}
23-
{%- set _ns._params = [] -%}
24-
{%- for host in groups['etcd'] -%}
25-
{%- set _ns._params = _ns._params + [host + "=https://" + hostvars[host].ansible_eth1.ipv4.address + ":2380"] -%}
26-
{%- endfor -%}
27-
{{ _ns._params | join(',') }}
28-
etcd_advertise_client_urls: "https://{{ ansible_eth1.ipv4.address }}:2379"
29-
etcd_csr_subject_alt_name: >-
30-
{%- set _ns = namespace() -%}
31-
{%- set _ns._params = ["DNS:localhost", "IP:127.0.0.1"] -%}
32-
{%- for host in groups['etcd'] -%}
33-
{%- set _ns._params = _ns._params + ["DNS:" + host, "IP:" + hostvars[host].ansible_eth1.ipv4.address] -%}
34-
{%- endfor -%}
35-
{{ _ns._params }}
36-
etcd_peer_csr_subject_alt_name: >-
37-
{%- set _ns = namespace() -%}
38-
{%- set _ns._params = ["DNS:localhost", "IP:127.0.0.1"] -%}
39-
{%- for host in groups['etcd'] -%}
40-
{%- set _ns._params = _ns._params + ["DNS:" + host, "IP:" + hostvars[host].ansible_eth1.ipv4.address] -%}
41-
{%- endfor -%}
42-
{{ _ns._params }}
43-
44-
# kube_master
45-
kubernetes_etcd:
46-
external:
47-
endpoints: >-
48-
{%- set _ns = namespace() -%}
49-
{%- set _ns._params = [] -%}
50-
{%- for host in groups['etcd'] -%}
51-
{%- set _ns._params = _ns._params + ["https://" + hostvars[host].ansible_eth1.ipv4.address + ":2379"] -%}
52-
{%- endfor -%}
53-
{{ _ns._params }}
54-
caFile: "/etc/kubernetes/pki/etcd/ca.crt"
55-
certFile: "/etc/kubernetes/pki/apiserver-etcd-client.crt"
56-
keyFile: "/etc/kubernetes/pki/apiserver-etcd-client.key"
57-
kubelet_node_ip: "{{ ansible_eth1.ipv4.address }}"
58-
kube_apiserver_advertise_address: "{{ ansible_eth1.ipv4.address }}"
59-
kube_apiserver_endpoint: "{{ hostvars[groups['kube_master'][0]].ansible_eth1.ipv4.address }}:{{ kube_apiserver_bind_port }}"
60-
kube_apiserver_csr_subject_alt_name: >-
61-
{%- set _ns = namespace() -%}
62-
{%- set _ns._params = ["DNS:localhost", "IP:127.0.0.1"] -%}
63-
{%- for host in groups['kube_master'] -%}
64-
{%- set _ns._params = _ns._params + ["DNS:" + host, "IP:" + hostvars[host].ansible_eth1.ipv4.address] -%}
65-
{%- endfor -%}
66-
{{ _ns._params }}

‎molecule/debian-10/molecule.yml

+4-12
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,11 @@ platforms:
2323
box: generic/debian10
2424
cpu: 2
2525
memory: 4096
26-
interfaces:
27-
- auto_config: true
28-
network_name: private_network
29-
type: dhcp
30-
provider_options:
31-
cpu_mode: "'host-model'"
32-
disk_bus: "'virtio'"
33-
driver: "'kvm'"
34-
nested: "'true'"
35-
nic_model_type: "'virtio'"
36-
video_type: "'virtio'"
37-
volume_cache: "'writeback'"
3826
provider_raw_config_args:
27+
- "disk_bus = 'virtio'"
28+
- "nic_model_type = 'virtio'"
29+
- "video_type = 'virtio'"
30+
- "volume_cache = 'writeback'"
3931
- "storage :file, bus: 'virtio', cache: 'writeback'"
4032
groups:
4133
- ansible

0 commit comments

Comments
 (0)