Merge branch 'master' into dev-1.15

2019-06-19 23:19:27 +03:00
parent f04d0cf472 0e1e971f13
commit 455f312775
33 changed files with 458 additions and 302 deletions
@@ -316,8 +316,9 @@ without compromising the minimum required capacity for running your workloads.
    {{< tabs name="k8s_kubelet_and_kubectl" >}}
    {{% tab name="Ubuntu, Debian or HypriotOS" %}}
    # replace x in 1.14.x-00 with the latest patch version
-    apt-get update
-    apt-get install -y kubelet=1.14.x-00 kubectl=1.14.x-00
+    apt-mark unhold kubelet kubectl && \
+    apt-get update && apt-get install -y kubelet=1.14.x-00 kubectl=1.14.x-00 && \
+    apt-mark hold kubelet kubectl
    {{% /tab %}}
    {{% tab name="CentOS, RHEL or Fedora" %}}
    # replace x in 1.14.x-0 with the latest patch version