Merge branch 'release/4.3.0'

hswong3i · hswong3i · commit 8e09f5b26e4b · 2020-04-22T09:57:41.000+08:00
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,6 @@ env:
 
 jobs:
   allow_failures:
-    - env: MOLECULE_SCENARIO_NAME="ubuntu-20.04"
     - env: MOLECULE_SCENARIO_NAME="ubuntu-19.10"
     - env: MOLECULE_SCENARIO_NAME="centos-8"
     - env: MOLECULE_SCENARIO_NAME="centos-7"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Ansible Collection for Kubernetes
 
-## 4.3.0 - TBC
+## 4.4.0 - TBC
+
+### Major Changes
+
+## 4.3.0 - 2020-04-22
 
 ### Major Changes
 
@@ -12,9 +16,12 @@
   - Migrate group name to lowercase or underline
   - Migrate molecule `group_vars` to file
   - Consolidate molecule tests into `default` (noop)
+  - Revamp as Ansible Collection
   - Revamp with `kube_master` and `kube_node`
   - Default with `cri_o`
   - Default with `ExternalEtcd`
+  - Default with Ceph Octoups
+  - Default with kubernetes v1.18
 
 ## 4.2.0 - 2020-02-15
 
diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ This Ansible collection provides Ansible playbooks and roles for the deployment
 
 This playbook require Ansible 2.9 or higher.
 
-This playbook was designed for Ubuntu 16.04/18.04/19.10 or RHEL/CentOS 7/8 or openSUSE Leap 15.1.
+This playbook was designed for Ubuntu 18.04/19.10/20.04 or RHEL/CentOS 7/8 or openSUSE Leap 15.1.
 
 ## Quick Start
 
@@ -52,7 +52,7 @@ This deployment will setup the follow components:
   - [Dashboard](https://github.com/kubernetes/dashboard)
   - [NGINX Ingress Controller](https://github.com/kubernetes/ingress-nginx)
   - [cert-manager](https://github.com/jetstack/cert-manager)
-  - [Local Path Provisioner](https://github.com/rancher/local-path-provisioner)
+  - [CSI Hostpath](https://github.com/kubernetes-csi/csi-driver-host-path)
 
 Simply run the playbooks with sample AIO inventory:
 
@@ -79,7 +79,7 @@ This deployment will setup the follow components:
   - [Dashboard](https://github.com/kubernetes/dashboard)
   - [NGINX Ingress Controller](https://github.com/kubernetes/ingress-nginx)
   - [cert-manager](https://github.com/jetstack/cert-manager)
-  - [CephFS Volume Provisioner](https://github.com/kubernetes-incubator/external-storage/tree/master/ceph/cephfs)
+  - [CSI Ceph](https://github.com/ceph/ceph-csi)
 
 Start by copying the sample inventory for customization:
 
@@ -110,17 +110,18 @@ Moreover, we don't setup the Ceph OSD and Ceph MDS for you, which you should set
     ceph-volume lvm activate --all
     
     # Create OSD pool for RBD
-    ceph osd pool create rbd 8 8
+    ceph osd pool create rbd
     ceph osd pool set rbd size 3
     ceph osd pool set rbd min_size 2
+    ceph osd pool application enable rbd rbd
     
     # Create OSD pool for CephFS Metadata
-    ceph osd pool create cephfs_metadata 32 32
+    ceph osd pool create cephfs_metadata
     ceph osd pool set cephfs_metadata size 3
     ceph osd pool set cephfs_metadata min_size 2
     
     # Create OSD pool for CephFS data
-    ceph osd pool create cephfs_data 128 128
+    ceph osd pool create cephfs_data
     ceph osd pool set cephfs_data size 3
     ceph osd pool set cephfs_data min_size 2
     
diff --git a/inventory/sample/group_vars/all/00-defaults.yml b/inventory/sample/group_vars/all/00-defaults.yml
@@ -15,12 +15,12 @@
 # limitations under the License.
 
 # release
-ceph_release: "14.2"
+ceph_release: "15.2"
 kernel_release: "mainline"
 
 # version
-cri_o_version: "v1.17.3"
-kubernetes_version: "v1.17.4"
+cri_o_version: "v1.18.0-rc1"
+kubernetes_version: "v1.18.2"
 
 # ceph_common
 ceph_fsid: "{{ hostvars[groups['ceph_mon'][0]].ansible_machine_id | to_uuid }}"
diff --git a/molecule/centos-7/molecule.yml b/molecule/centos-7/molecule.yml
@@ -21,8 +21,8 @@ driver:
 platforms:
   - name: ${MOLECULE_INSTANCE_NAME}-1
     box: generic/centos7
-    cpu: 2
-    memory: 2048
+    cpu: 4
+    memory: 4096
     interfaces:
       - auto_config: true
         network_name: private_network
diff --git a/molecule/centos-8/molecule.yml b/molecule/centos-8/molecule.yml
@@ -21,8 +21,8 @@ driver:
 platforms:
   - name: ${MOLECULE_INSTANCE_NAME}-1
     box: generic/centos8
-    cpu: 2
-    memory: 2048
+    cpu: 4
+    memory: 4096
     interfaces:
       - auto_config: true
         network_name: private_network
diff --git a/molecule/default/Dockerfile.j2 b/molecule/default/Dockerfile.j2
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ubuntu:18.04
+FROM ubuntu:20.04
 
 ENV LANG   "en_US.utf8"
 ENV LC_ALL "en_US.utf8"
diff --git a/molecule/default/group_vars/all/00-defaults.yml b/molecule/default/group_vars/all/00-defaults.yml
@@ -1 +1 @@
-../../../../defaults/main.yml
+../../../../inventory/sample/group_vars/all/00-defaults.yml
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -24,7 +24,7 @@ platforms:
       - "/sys/fs/cgroup:/sys/fs/cgroup:rw"
     entrypoint: init
     command: "bash -c 'sleep infinity'"
-    tty: True
+    tty: true
     env:
       container: docker
 lint: |
diff --git a/molecule/redhat-7/molecule.yml b/molecule/redhat-7/molecule.yml
@@ -21,8 +21,8 @@ driver:
 platforms:
   - name: ${MOLECULE_INSTANCE_NAME}-1
     box: generic/rhel7
-    cpu: 2
-    memory: 2048
+    cpu: 4
+    memory: 4096
     interfaces:
       - auto_config: true
         network_name: private_network
diff --git a/molecule/redhat-8/molecule.yml b/molecule/redhat-8/molecule.yml
@@ -21,8 +21,8 @@ driver:
 platforms:
   - name: ${MOLECULE_INSTANCE_NAME}-1
     box: generic/rhel8
-    cpu: 2
-    memory: 2048
+    cpu: 4
+    memory: 4096
     interfaces:
       - auto_config: true
         network_name: private_network
diff --git a/molecule/suse-15/molecule.yml b/molecule/suse-15/molecule.yml
@@ -21,8 +21,8 @@ driver:
 platforms:
   - name: ${MOLECULE_INSTANCE_NAME}-1
     box: generic/opensuse15
-    cpu: 2
-    memory: 2048
+    cpu: 4
+    memory: 4096
     interfaces:
       - auto_config: true
         network_name: private_network
diff --git a/molecule/ubuntu-18.04/molecule.yml b/molecule/ubuntu-18.04/molecule.yml
@@ -21,8 +21,8 @@ driver:
 platforms:
   - name: ${MOLECULE_INSTANCE_NAME}-1
     box: generic/ubuntu1804
-    cpu: 2
-    memory: 2048
+    cpu: 4
+    memory: 4096
     interfaces:
       - auto_config: true
         network_name: private_network
diff --git a/molecule/ubuntu-19.10/molecule.yml b/molecule/ubuntu-19.10/molecule.yml
@@ -21,8 +21,8 @@ driver:
 platforms:
   - name: ${MOLECULE_INSTANCE_NAME}-1
     box: generic/ubuntu1910
-    cpu: 2
-    memory: 2048
+    cpu: 4
+    memory: 4096
     interfaces:
       - auto_config: true
         network_name: private_network
diff --git a/molecule/ubuntu-20.04/molecule.yml b/molecule/ubuntu-20.04/molecule.yml
@@ -20,9 +20,9 @@ driver:
     name: libvirt
 platforms:
   - name: ${MOLECULE_INSTANCE_NAME}-1
-    box: generic/ubuntu2004
-    cpu: 2
-    memory: 2048
+    box: abi/ubuntu2004
+    cpu: 4
+    memory: 4096
     interfaces:
       - auto_config: true
         network_name: private_network
diff --git a/playbooks/ceph-verify.yml b/playbooks/ceph-verify.yml
@@ -58,7 +58,7 @@
     - name: ceph osd pool create rbd
       shell: |
         set -o pipefail
-        ceph osd pool create rbd 8 8
+        ceph osd pool create rbd
         ceph osd pool set rbd size 1
         ceph osd pool set rbd min_size 1
         ceph osd pool application enable rbd rbd
@@ -80,7 +80,7 @@
     - name: ceph osd pool create cephfs_metadata
       shell: |
         set -o pipefail
-        ceph osd pool create cephfs_metadata 32 32
+        ceph osd pool create cephfs_metadata
         ceph osd pool set cephfs_metadata size 1
         ceph osd pool set cephfs_metadata min_size 1
       args:
@@ -92,7 +92,7 @@
     - name: ceph osd pool create cephfs_data
       shell: |
         set -o pipefail
-        ceph osd pool create cephfs_data 128 128
+        ceph osd pool create cephfs_data
         ceph osd pool set cephfs_data size 1
         ceph osd pool set cephfs_data min_size 1
       args:
diff --git a/playbooks/cri_o-install.yml b/playbooks/cri_o-install.yml
@@ -46,6 +46,9 @@
   remote_user: root
   become: true
   tasks:
+    - include_role:
+        name: golang
+
     - include_role:
         name: cni_plugins
 
diff --git a/roles/ansible b/roles/ansible
@@ -1 +1 @@
-Subproject commit 69fb596ac7e06528486a32d0c14eb08e3f8bb208
+Subproject commit c8e44709d7179275a2a1478fdec6b1f97422fa84
diff --git a/roles/bootstrap b/roles/bootstrap
@@ -1 +1 @@
-Subproject commit b053276797ada83945f09633485332a0206dd449
+Subproject commit 1a34884b32dd406fcc037b0f7b868213fedc5819
diff --git a/roles/buildah b/roles/buildah
@@ -1 +1 @@
-Subproject commit 6e3462a327429971ce3876b1505a85e7a8cdd382
+Subproject commit 47e186324a70868f576f21b4c7d0c8cf3fda0820
diff --git a/roles/ceph_common b/roles/ceph_common
@@ -1 +1 @@
-Subproject commit c9dfb6a98e460306a285d32a021592f0c92c1fff
+Subproject commit c639fbb7f10848ab3356e84895740c614be6c1cd
diff --git a/roles/ceph_mds b/roles/ceph_mds
@@ -1 +1 @@
-Subproject commit 6ce705a0b67ffb6b80eac5618e289262801aa8ee
+Subproject commit efbbb95a2aad9fe6eb7b50c895ae2a9748682ce6
diff --git a/roles/ceph_mgr b/roles/ceph_mgr
@@ -1 +1 @@
-Subproject commit 1a29f3b1ec8684a706f9aec6699a7d94a39dbcb5
+Subproject commit 6706ae3f8df0c0b3de7994bc414de931e6617db8
diff --git a/roles/ceph_mon b/roles/ceph_mon
@@ -1 +1 @@
-Subproject commit 5672b226b72a019be2610035a05ef7f63a0c8235
+Subproject commit 40701db2d86c0dc74a3768b33a79fe305c6a7743
diff --git a/roles/ceph_osd b/roles/ceph_osd
@@ -1 +1 @@
-Subproject commit b0ef72ac28c91e9aeac2b54f11b99ae0778ca77f
+Subproject commit 7af509b1b4b0075ea6f8fdce4810fdebeb35f329
diff --git a/roles/ceph_rgw b/roles/ceph_rgw
@@ -1 +1 @@
-Subproject commit e6eaebcc6a1c40e82a8420bed07d79f9a1c09f0e
+Subproject commit 43166a97a7ba08be46773dbc5e1dec8f51c51e0a
diff --git a/roles/chrony b/roles/chrony
@@ -1 +1 @@
-Subproject commit 92ebc81ad2487bfdc1004d406b7ba7addf1e561b
+Subproject commit 898dc824fb652c971aaaa4be85f6626eb2e1152e
diff --git a/roles/cni_plugins b/roles/cni_plugins
@@ -1 +1 @@
-Subproject commit c8dad6fee868e0cd14840f4d395b1e8433a2b152
+Subproject commit 75617ef861b29ad6c0ee5c156513b89998499c5e
diff --git a/roles/conmon b/roles/conmon
@@ -1 +1 @@
-Subproject commit 2eb2054d0872a04abd8acca66a535b2794b7f39c
+Subproject commit 8827767489ac9c292a33bcce336f3d7cf7292e35
diff --git a/roles/containers_common b/roles/containers_common
@@ -1 +1 @@
-Subproject commit 9de9176fec47112c18e19d2176e7151eb9033399
+Subproject commit 9e5057e4f7ff04a8c9a679a961ccb4c57ab25cf6
diff --git a/roles/cri_o b/roles/cri_o
@@ -1 +1 @@
-Subproject commit fe503ebc09733d6b29ec0976a7cfb4bc6807961b
+Subproject commit df13306d86c819efda593dcb539c5125260cb338
diff --git a/roles/cri_tools b/roles/cri_tools
@@ -1 +1 @@
-Subproject commit df6d6f4aa1388eaa1b4c7a4cba1a15d51c0afdc0
+Subproject commit d16acc43a2650df6b98a7402f0af520e06f23c78
diff --git a/roles/etcd b/roles/etcd
@@ -1 +1 @@
-Subproject commit 76d2986173e8d791a9dc177226df521f76e2a72e
+Subproject commit 788750d11bf38983895ec6ce55c56da3b46167dd
diff --git a/roles/git b/roles/git
@@ -1 +1 @@
-Subproject commit d268acd2c5a022f4cdfad92e64db853ecb60dc4d
+Subproject commit 5674052ea02d2d4f6bc5b7d1bba4812979ffd949
diff --git a/roles/golang b/roles/golang
@@ -1 +1 @@
-Subproject commit 275fd5464acfb5dd9085d3e9e0b6316c95f07338
+Subproject commit a96252ba5a4407f8192558da99a437576fdee497
diff --git a/roles/kernel b/roles/kernel
@@ -1 +1 @@
-Subproject commit 19c321616747899dfebb93db3bdd0a3c2f778298
+Subproject commit 3cc3eba9b3d6d577ea4833dde130b9df49e9a1bf
diff --git a/roles/kube_master b/roles/kube_master
@@ -1 +1 @@
-Subproject commit 7d65f34fd247aeea98b8b51d7fa750cf82cb512e
+Subproject commit 7c1839544b6727ba402e4b603f1229f26541f7d6
diff --git a/roles/kube_node b/roles/kube_node
@@ -1 +1 @@
-Subproject commit 8670e784889927daaf266a44eb5dc3b341d66416
+Subproject commit cda37a2ab1fcaaa506120a27def4644f5ca84e74
diff --git a/roles/kubeadm b/roles/kubeadm
@@ -1 +1 @@
-Subproject commit 0519c285299e5d22987bbadceb2786f425b91ead
+Subproject commit 8ae468d33b058f0fc582dc3bb4a0e9ad23832706
diff --git a/roles/kubectl b/roles/kubectl
@@ -1 +1 @@
-Subproject commit 0df88952e7dac7aaeeef9a9aee4fe8a982714ffd
+Subproject commit 6f572f11b1c6c5f4d7e463733dd77a6aab11c8b3
diff --git a/roles/kubelet b/roles/kubelet
@@ -1 +1 @@
-Subproject commit 130427644701d214a538b8c3b2bf325be91d3499
+Subproject commit 2311d730ee0eedcbf8a535f9a96ce9e23153ec1b
diff --git a/roles/kubernetes_addon_manager b/roles/kubernetes_addon_manager
@@ -1 +1 @@
-Subproject commit 93f076d9c95bdc7b9cf171cd421135bf0b8208fc
+Subproject commit 6984d70b0f2cc9f357c8eca6c4596d8de8ac72b9
diff --git a/roles/kubernetes_cert_manager b/roles/kubernetes_cert_manager
@@ -1 +1 @@
-Subproject commit aaa83d40a4b1015764d35ac829a1d60016d52ab9
+Subproject commit 6dd9c2d664a669ee0ec56587e6bf58ca5fcc6853
diff --git a/roles/kubernetes_csi_cephfs b/roles/kubernetes_csi_cephfs
@@ -1 +1 @@
-Subproject commit c0c21f3442b3ee10d00ce053523640982d18c8db
+Subproject commit f22810ae51f891789ee5b33cff1bc9812ab5dcee
diff --git a/roles/kubernetes_csi_hostpath b/roles/kubernetes_csi_hostpath
@@ -1 +1 @@
-Subproject commit 13c6faf8acd26f04c6a0650e052d46cb6096124d
+Subproject commit 980891a6d819c5c25d79e6a12edee58f14435f50
diff --git a/roles/kubernetes_csi_rbd b/roles/kubernetes_csi_rbd
@@ -1 +1 @@
-Subproject commit b81ad0a3b63410eb3e6bac557372cd48ff6799d3
+Subproject commit e339748ae1f771a68a9d7d254c146783129a014c
diff --git a/roles/kubernetes_dashboard b/roles/kubernetes_dashboard
@@ -1 +1 @@
-Subproject commit acbfdfdd3c31a1c5761d8225480530aad497348b
+Subproject commit 765fb01ea6faea0c4646b8b7cbf59bdd93d085c3
diff --git a/roles/kubernetes_flannel b/roles/kubernetes_flannel
@@ -1 +1 @@
-Subproject commit ad2e54cbb9c5ebb76939de4737c504bd9dad2acb
+Subproject commit aa830cf2cc844ba556156d34ac003d01a09d0392
diff --git a/roles/kubernetes_ingress_nginx b/roles/kubernetes_ingress_nginx
@@ -1 +1 @@
-Subproject commit 693a7bb596fd996dce019df92bd094f3f380997d
+Subproject commit 99ae3d6b448bdd4c7e5b6c7fd5cd68cdb2027bed
diff --git a/roles/kubernetes_metallb b/roles/kubernetes_metallb
@@ -1 +1 @@
-Subproject commit 95b24dfc6468c33ef69765769e10e0d9c5222052
+Subproject commit 339ad1a29ee953317ce54e31823519ba081045f0
diff --git a/roles/kubernetes_registry b/roles/kubernetes_registry
@@ -1 +1 @@
-Subproject commit 18919f5ddc9b706c33d717312ffdd6f4ea66dc3a
+Subproject commit f38bcdbb6211ba74738798505d55e659f6dfb67c
diff --git a/roles/kubernetes_weave b/roles/kubernetes_weave
@@ -1 +1 @@
-Subproject commit 47dc47da1dae521600039d6db79c182e6680fbcf
+Subproject commit a377212965464805dd11889671b56c5891df58e8
diff --git a/roles/locales b/roles/locales
@@ -1 +1 @@
-Subproject commit e86d17bec10410271ca1b698667356d61742ca58
+Subproject commit d14358bdd0f46b946b8175fea5a78a63b5fe2875
diff --git a/roles/operator_sdk b/roles/operator_sdk
@@ -1 +1 @@
-Subproject commit 19bfdad4db522ab476443704d37726af56082d99
+Subproject commit daca161494665d82d34fa310efd065c783a6c637
diff --git a/roles/podman b/roles/podman
@@ -1 +1 @@
-Subproject commit a21cb9eb6ac48102346841038f7e885e7d22e81d
+Subproject commit 4f500b3acecf05bad75164d976e8cd000c8f8401
diff --git a/roles/python b/roles/python
@@ -1 +1 @@
-Subproject commit d060e8ce864cf18d4a7dd59a9429f82178842757
+Subproject commit 7cc54cfdb282533639130d79183251fed8908e1f
diff --git a/roles/rclone b/roles/rclone
@@ -1 +1 @@
-Subproject commit 02cec37f34386f5b152e61d50431b7742d8f1a50
+Subproject commit 3cf1f3453c00a2811f024d0aebd0d15d7259eb9f
diff --git a/roles/restic b/roles/restic
@@ -1 +1 @@
-Subproject commit 0d38052634c1e69f14a221a8d4d97c1f2067dfa9
+Subproject commit 4d94f705a99e351099a5ac6b1929d0eaa984f311
diff --git a/roles/runc b/roles/runc
@@ -1 +1 @@
-Subproject commit f5b687bdc669be484ff13850fda3ce3b6afe02b3
+Subproject commit 11f14e0e8d08d5db0d92584d72f0d7a2a63c793f
diff --git a/roles/skopeo b/roles/skopeo
@@ -1 +1 @@
-Subproject commit 83e333985da557bc06af3c707288717b5fa7b293
+Subproject commit abc59628089680b53b6a8160d76fef42cd51177b
diff --git a/roles/sshd b/roles/sshd
@@ -1 +1 @@
-Subproject commit 9cbbb35ae4c7e6cd2cce8a90c6807c08d1371c4a
+Subproject commit b839cac09e3bc31c364a18e270618829dbee0225
diff --git a/roles/timezone b/roles/timezone
@@ -1 +1 @@
-Subproject commit 88eb2a7d3803909eeb1200ab884b5e32df55374e
+Subproject commit 1be64be61c10000c7d13f1611dda9d844e9c3c01

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-../../../../defaults/main.yml`
	`1`	`+../../../../inventory/sample/group_vars/all/00-defaults.yml`