Merge branch 'master' of https://github.com/kubernetes-sigs/kubespray

* 'master' of https://github.com/kubernetes-sigs/kubespray:
  Parse calico nodes as json (kubernetes-sigs#5114)
  remove unimplemented custom_flags vars, document the extra_args vars (issue 4352) (kubernetes-sigs#5108)
  Allow calico settings to be modified (kubernetes-sigs#5101)
  Added CRI-O support for ubuntu (kubernetes-sigs#4629)
  Replace fetch with synchronize due to memory error (kubernetes-sigs#5084)
  Use raw module for bootstrap-debian.yml (kubernetes-sigs#5061)
  Update CRI-O in CentOS (kubernetes-sigs#4582)
  Add localhost to ansible.limit. (kubernetes-sigs#5037)
  fix bug: run Copy image to ansible host cache on download_delegate host (kubernetes-sigs#5094)

README.md

@@ -112,7 +112,7 @@ Supported Components
     -   [kubernetes](https://github.com/kubernetes/kubernetes) v1.15.3
     -   [etcd](https://github.com/coreos/etcd) v3.3.10
     -   [docker](https://www.docker.com/) v18.06 (see note)
-    -   [cri-o](http://cri-o.io/) v1.11.5 (experimental: see [CRI-O Note](docs/cri-o.md). Only on centos based OS)
+    -   [cri-o](http://cri-o.io/) v1.14.0 (experimental: see [CRI-O Note](docs/cri-o.md). Only on centos based OS)
 -   Network Plugin
     -   [cni-plugins](https://github.com/containernetworking/plugins) v0.8.1
     -   [calico](https://github.com/projectcalico/calico) v3.7.3

Vagrantfile

@@ -206,7 +206,7 @@ Vagrant.configure("2") do |config|
             ansible.inventory_path = $ansible_inventory_path
           end
           ansible.become = true
-          ansible.limit = "all"
+          ansible.limit = "all,localhost"
           ansible.host_key_checking = false
           ansible.raw_arguments = ["--forks=#{$num_instances}", "--flush-cache", "-e ansible_become_pass=vagrant"]
           ansible.host_vars = host_vars

docs/vars.md

@@ -160,12 +160,15 @@ kubelet_custom_flags:
   - "--eviction-soft=memory.available<300Mi"
 ```
 The possible vars are:
-* *apiserver_custom_flags*
-* *controller_mgr_custom_flags*
-* *scheduler_custom_flags*
 * *kubelet_custom_flags*
 * *kubelet_node_custom_flags*
 
+Extra flags for the API server, controller, and scheduler components can be specified using these variables, 
+in the form of dicts of key-value pairs of configuration parameters that will be inserted into the kubeadm YAML config file:
+* *kube_kubeadm_apiserver_extra_args*
+* *kube_kubeadm_controller_extra_args*
+* *kube_kubeadm_scheduler_extra_args*
+
 #### User accounts
 
 By default, a user with admin rights is created, named `kube`.

roles/bootstrap-os/tasks/bootstrap-debian.yml

@@ -50,6 +50,20 @@
     - https_proxy is defined
     - need_https_proxy.rc != 0
 
+- name: Change Network Name Resolution configuration
+  raw: sed -i 's/^DNSSEC=yes/DNSSEC=allow-downgrade/g' /etc/systemd/resolved.conf
+  become: true
+  environment: {}
+  when:
+    - '"bionic" in os_release.stdout'
+
+- name: Restart systemd-resolved service
+  raw: systemctl restart systemd-resolved
+  become: true
+  environment: {}
+  when:
+    - '"bionic" in os_release.stdout'
+
 - name: Install python
   raw:
     apt-get update && \

roles/container-engine/cri-o/defaults/main.yml

@@ -1,2 +1,2 @@
 ---
-crio_rhel_repo_base_url: 'http://mirror.centos.org/centos/7/paas/x86_64/openshift-origin311/'
+crio_rhel_repo_base_url: 'https://cbs.centos.org/repos/paas7-crio-114-candidate/x86_64/os/'

roles/container-engine/cri-o/tasks/main.yaml

@@ -30,6 +30,19 @@
     state: present
   when: ansible_distribution in ["Ubuntu"]
 
+- name: Add CRI-O PPA
+  apt_repository:
+    repo: ppa:projectatomic/ppa
+    state: present
+  when: ansible_distribution in ["Ubuntu"]
+
+- name: Install crictl
+  unarchive:
+    src: "{{ local_release_dir }}/crictl-{{ crictl_version }}-linux-{{ image_arch }}.tar.gz"
+    dest: "/usr/local/bin"
+    mode: 0755
+    remote_src: yes
+
 - name: Make sure needed folders exist in the system
   with_items:
     - /etc/crio