containerd config and small documentation fixes

README.md

@@ -29,9 +29,12 @@ ansible-playbook install.yml
 ```sh
 cd /root/kubespray
 docker login
-ansible-playbook -i inventory/prod/inventory.ini cluster.yml -e download_run_once=True -e download_localhost=True --become
+ansible-playbook -i inventory/prod/inventory.ini cluster.yml --become
 ```
 
+(`-e download_run_once=True -e download_localhost=True` removed because of containerd. 
+mgmt vm should get a better configuration to cache images)
+
 (prod `inventory` is copied from `ansible/files/...`)
 
 4. Copy .kube config with ansible (in local)

ansible/files/kubespray/inventory/prod/group_vars/all/all.yml

@@ -42,9 +42,9 @@ loadbalancer_apiserver_healthcheck_port: 8081
 ### OTHER OPTIONAL VARIABLES
 
 ## Upstream dns servers
-# upstream_dns_servers:
-#   - 8.8.8.8
-#   - 8.8.4.4
+upstream_dns_servers:
+  - 8.8.8.8
+  - 8.8.4.4
 
 ## There are some changes specific to the cloud providers
 ## for instance we need to encapsulate packets with some network plugins

ansible/files/kubespray/inventory/prod/group_vars/all/containerd.yml

@@ -28,7 +28,9 @@
 
 # containerd_metrics_grpc_histogram: false
 
-# containerd_registries:
-#   "docker.io": "https://registry-1.docker.io"
+containerd_registries:
+  "docker.io":
+    - "https://mirror.gcr.io"
+    - "https://registry-1.docker.io"
 
 # containerd_max_container_log_line_size: -1

ansible/files/kubespray/inventory/prod/group_vars/etcd.yml

@@ -19,4 +19,4 @@
 # etcd_peer_client_auth: true
 
 ## Settings for etcd deployment type
-etcd_deployment_type: docker
+etcd_deployment_type: host

ansible/files/kubespray/inventory/prod/group_vars/k8s_cluster/k8s-cluster.yml

@@ -192,7 +192,7 @@ dns_domain: "{{ cluster_name }}"
 
 ## Container runtime
 ## docker for docker, crio for cri-o and containerd for containerd.
-container_manager: docker
+container_manager: containerd
 
 # Additional container runtimes
 kata_containers_enabled: false

ansible/tasks/mgmt.yml

@@ -67,10 +67,6 @@
   shell:
     curl -sL https://istio.io/downloadIstioctl | sh -
 
-- name: Add istio to path
-  shell:
-    "export PATH=$PATH:$HOME/.istioctl/bin"
-
 - name: Update bashrc to export istioctl
   lineinfile:
     dest: $HOME/.bashrc

terraform/main.tf

@@ -90,7 +90,7 @@ resource "proxmox_vm_qemu" "vms" {
     for_each = var.vms
 
     name = "${each.key}"
-    desc = "Kubernetes worker node"
+    desc = "Terraform managed vm"
     vmid = each.value.vmid
 
     target_node = "maze"