Enable containerd to deploy vanilla containerd package (#4951)

* Enable containerd to deploy vanilla containerd package

Fixes kubeadm references to CRI socket for containerd
Fixes download role cache feature to work with containerd

Change-Id: I2ab8f0031107e2f0d1a85c39b4beb66f08509a01

* use containerd for flannel-addons job

Change-Id: Ied375c7d65e64a625ffbd995ff16f2374067dee6

* add containerd vars

Change-Id: Ib9a8a04e501c481a86235413cbec63f3672baf91

* fixup vars

Change-Id: Ibea64e4b18405a578b52a13da100384582aa24c2

* more fixes

* fix rh repo

Change-Id: I00575a77cfb7b81d6095db5d918a52023c8f13ba

* Adjust helm host install for containerd

roles/kubernetes/master/templates/kubeadm-controlplane.v1beta2.yaml.j2

@@ -5,7 +5,7 @@ discovery:
 {% if kubeadm_config_api_fqdn is defined %}
     apiServerEndpoint: {{ kubeadm_config_api_fqdn }}:{{ loadbalancer_apiserver.port | default(kube_apiserver_port) }}
 {% else %}
-    apiServerEndpoint: {{ kubeadm_discovery_address | replace("https://", "")}}
+    apiServerEndpoint: {{ kubeadm_discovery_address }}
 {% endif %}
     token: {{ kubeadm_token }}
     unsafeSkipCAVerification: true
@@ -18,8 +18,4 @@ controlPlane:
   certificateKey: {{ kubeadm_certificate_key }}
 nodeRegistration:
   name: {{ kube_override_hostname|default(inventory_hostname) }}
-{% if container_manager == 'crio' %}
-  criSocket: /var/run/crio/crio.sock
-{% else %}
-  criSocket: /var/run/dockershim.sock
-{% endif %}
+  criSocket: {{ cri_socket }}

tests/files/gce_centos7-flannel-addons.yml

@@ -5,25 +5,25 @@ cloud_region: us-central1-c
 cloud_machine_type: "n1-standard-2"
 mode: ha
 
-# Deployment settings
+# Kubespray settings
 kubeadm_control_plane: true
 kubeadm_certificate_key: 3998c58db6497dd17d909394e62d515368c06ec617710d02edea31c06d741085
+kube_proxy_mode: iptables
 kube_network_plugin: flannel
 helm_enabled: true
 kubernetes_audit: true
+container_manager: containerd
 etcd_events_cluster_enabled: true
 local_volume_provisioner_enabled: true
 etcd_deployment_type: host
 deploy_netchecker: true
 dns_min_replicas: 1
-cloud_provider: gce
 kube_encrypt_secret_data: true
-# ingress_nginx_enabled: true
+ingress_nginx_enabled: true
 cert_manager_enabled: true
-# Disabled temporarily
+# Disable as health checks are still unstable and slow to respond.
 metrics_server_enabled: false
 metrics_server_kubelet_insecure_tls: true
 kube_token_auth: true
 kube_basic_auth: true
 enable_nodelocaldns: false
-local_path_provisioner_enabled: true

tests/files/packet_centos7-flannel-addons.yml

@@ -10,6 +10,7 @@ kube_proxy_mode: iptables
 kube_network_plugin: flannel
 helm_enabled: true
 kubernetes_audit: true
+container_manager: containerd
 etcd_events_cluster_enabled: true
 local_volume_provisioner_enabled: true
 etcd_deployment_type: host

tests/files/packet_opensuse-canal.yml

@@ -5,5 +5,6 @@ mode: default
 
 # Kubespray settings
 kube_network_plugin: canal
+container_manager: containerd
 deploy_netchecker: true
 dns_min_replicas: 1