Split deploy steps in separate playbooks: part1 (#3451)

* Fix bootstrap_os/ubuntu idempotency

* Update bastion role

* move container_engine in sub-roles

* requires ansible 2.5

* ubuntu18 as first CI job

roles/docker/vars/ubuntu-bionic.yml → roles/container-engine/docker/vars/ubuntu-bionic.yml

 ---
 docker_kernel_min_version: '3.10'
 
-# overide defaults, missing 17.03 for Ubuntu 18.04
-docker_version: '18.06'
-
 use_docker_engine: false
 
 docker_versioned_pkg:

roles/container-engine/meta/main.yml

+---
+dependencies:
+  - role: container-engine/cri-o
+    when:
+      - container_manager == 'crio'
+    tags:
+      - container-engine
+      - crio
+
+  - role: container-engine/rkt
+    when:
+      - container_manager == 'rkt'
+    tags:
+      - container-engine
+      - rkt
+
+  - role: container-engine/docker
+    when:
+      - container_manager == 'docker' or container_manager == "rkt"
+    tags:
+      - container-engine
+      - docker
+      - rkt

roles/kubespray-defaults/defaults/main.yaml

@@ -59,6 +59,14 @@ skydns_server: "{{ kube_service_addresses|ipaddr('net')|ipaddr(3)|ipaddr('addres
 skydns_server_secondary: "{{ kube_service_addresses|ipaddr('net')|ipaddr(4)|ipaddr('address') }}"
 dnsmasq_dns_server: "{{ kube_service_addresses|ipaddr('net')|ipaddr(2)|ipaddr('address') }}"
 dns_domain: "{{ cluster_name }}"
+kube_dns_servers:
+  kubedns: ["{{skydns_server}}"]
+  coredns: ["{{skydns_server}}"]
+  coredns_dual: "{{[skydns_server] + [ skydns_server_secondary ]}}"
+  manual: ["{{manual_dns_server}}"]
+  dnsmasq_kubedns: ["{{dnsmasq_dns_server}}"]
+
+dns_servers: "{{kube_dns_servers[dns_mode]}}"
 
 # Kubernetes configuration dirs and system namespace.
 # Those are where all the additional config stuff goes

scale.yml

@@ -35,12 +35,7 @@
   roles:
     - { role: kubespray-defaults}
     - { role: kubernetes/preinstall, tags: preinstall }
-
-    - { role: docker, tags: docker, when: container_manager == 'docker' }
-    - { role: cri-o, tags: crio, when: container_manager == 'crio' }
-    - role: rkt
-      tags: rkt
-      when: "'rkt' in [etcd_deployment_type, kubelet_deployment_type, vault_deployment_type]"
+    - { role: container-engine, tags: "container-engine"}
     - { role: download, tags: download, when: "not skip_downloads" }
     - { role: etcd, tags: etcd, etcd_cluster_setup: false }
     - { role: vault, tags: vault, when: "cert_management == 'vault'"}

tests/files/gce_centos-weave-kubeadm.yml → tests/files/gce_centos-weave-kubeadm-sep.yml

@@ -3,6 +3,7 @@ cloud_image_family: centos-7
 cloud_machine_type: "n1-standard-1"
 cloud_region: us-central1-b
 mode: ha
+
 startup_script: ""
 
 # Deployment settings

tests/files/gce_ubuntu18-flannel-aio.yml

@@ -5,10 +5,10 @@ cloud_machine_type: "n1-standard-1"
 mode: aio
 
 # Deployment settings
-
+kubeadm_enabled: false
 bootstrap_os: ubuntu
 kube_network_plugin: flannel
-
+dynamic_kubelet_configuration: true
 deploy_netchecker: true
 kubedns_min_replicas: 1
 cloud_provider: gce

upgrade-cluster.yml

 ---
-- hosts: localhost
+- hosts: bastion[0]
   gather_facts: False
   roles:
     - { role: kubespray-defaults}
@@ -34,11 +34,7 @@
   roles:
     - { role: kubespray-defaults}
     - { role: kubernetes/preinstall, tags: preinstall }
-    - { role: docker, tags: docker, when: container_manager == 'docker' }
-    - { role: cri-o, tags: crio, when: container_manager == 'crio' }
-    - role: rkt
-      tags: rkt
-      when: "'rkt' in [etcd_deployment_type, kubelet_deployment_type, vault_deployment_type]"
+    - { role: container-engine, tags: "container-engine"}
     - { role: download, tags: download, when: "not skip_downloads" }
   environment: "{{proxy_env}}"