From f458101417dcd20a330f3d3d6beb4f27358c8a0b Mon Sep 17 00:00:00 2001
From: blacs30 <github@lisowski-development.com>
Date: Tue, 27 Oct 2020 22:47:42 +0100
Subject: [PATCH] Use the same versions as official kubespray release.

---
 roles/container-engine/containerd/defaults/main.yml     | 2 +-
 roles/container-engine/containerd/vars/ubuntu-amd64.yml | 2 +-
 roles/download/defaults/main.yml                        | 8 ++++----
 roles/network_plugin/calico/defaults/main.yml           | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/roles/container-engine/containerd/defaults/main.yml b/roles/container-engine/containerd/defaults/main.yml
index afbf4827613..a37786e8143 100644
--- a/roles/container-engine/containerd/defaults/main.yml
+++ b/roles/container-engine/containerd/defaults/main.yml
@@ -11,7 +11,7 @@ containerd_config:
   # containerd:
   #   snapshotter: native
 
-containerd_version: '1.3.4'
+containerd_version: '1.2.13'
 containerd_package: 'containerd.io'
 
 containerd_cfg_dir: /etc/containerd
diff --git a/roles/container-engine/containerd/vars/ubuntu-amd64.yml b/roles/container-engine/containerd/vars/ubuntu-amd64.yml
index 6fbe0fc3fef..013df15379f 100644
--- a/roles/container-engine/containerd/vars/ubuntu-amd64.yml
+++ b/roles/container-engine/containerd/vars/ubuntu-amd64.yml
@@ -19,4 +19,4 @@ containerd_repo_info:
       {{ ansible_distribution_release|lower }}
       {{ containerd_ubuntu_repo_component }}
 
-runc_binary: "{{ bin_dir }}/runc"
+runc_binary: /usr/bin/runc
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 10349e2c0c1..5f432722be3 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -51,7 +51,7 @@ image_arch: "{{host_architecture | default('amd64')}}"
 # Versions
 kube_version: v1.18.9
 kubeadm_version: "{{ kube_version }}"
-etcd_version: v3.4.13
+etcd_version: v3.4.3
 
 # gcr and kubernetes image repo define
 gcr_image_repo: "gcr.io"
@@ -94,7 +94,7 @@ crictl_supported_versions:
   v1.17: "v1.17.0"
 crictl_version: "{{ crictl_supported_versions[kube_major_version] }}"
 runc_version: 1.0.0-rc92
-containerd_version: 1.4.1
+containerd_version: 1.2.13
 
 # Download URLs
 kubelet_download_url: "https://storage.googleapis.com/kubernetes-release/release/{{ kube_version }}/bin/linux/{{ image_arch }}/kubelet"
@@ -368,8 +368,8 @@ etcd_binary_checksums:
   # Etcd does not have arm32 builds at the moment, having some dummy value is
   # required to avoid "no attribute" error
   arm: 0
-  arm64: 1934ebb9f9f6501f706111b78e5e321a7ff8d7792d3d96a76e2d01874e42a300
-  amd64: 2ac029e47bab752dacdb7b30032f230f49e2f457cbc32e8f555c2210bb5ff107
+  arm64: 01bd849ad99693600bd59db8d0e66ac64aac1e3801900665c31bd393972e3554
+  amd64: 6c642b723a86941b99753dff6c00b26d3b033209b15ee33325dc8e7f4cd68f07
 cni_binary_checksums:
   arm: 5757778f4c322ffd93d7586c60037b81a2eb79271af6f4edf9ff62b4f7868ed9
   arm64: ae13d7b5c05bd180ea9b5b68f44bdaa7bfb41034a2ef1d68fd8e1259797d642f
diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
index 336478b216d..b8ed0339386 100644
--- a/roles/network_plugin/calico/defaults/main.yml
+++ b/roles/network_plugin/calico/defaults/main.yml
@@ -30,7 +30,7 @@ calico_node_cpu_requests: 150m
 calico_felix_chaininsertmode: Insert
 
 # Enable Prometheus Metrics endpoint for felix
-calico_felix_prometheusmetricsenabled: true
+calico_felix_prometheusmetricsenabled: false
 calico_felix_prometheusmetricsport: 9091
 calico_felix_prometheusgometricsenabled: true
 calico_felix_prometheusprocessmetricsenabled: true