remove flannel/containerd e2e config since it is passed in jenkins al…

…ready

Signed-off-by: Jess Frazelle <[email protected]>

parts/k8s/kubernetescustomscript.sh

@@ -160,7 +160,7 @@ function installDeps() {
     # make sure walinuxagent doesn't get updated in the middle of running this script
     retrycmd_if_failure 20 5 30 apt-mark hold walinuxagent || exit $ERR_HOLD_WALINUXAGENT
     # See https://github.com/kubernetes/kubernetes/blob/master/build/debian-hyperkube-base/Dockerfile#L25-L44
-    apt_get_install 20 30 300 apt-transport-https ca-certificates iptables iproute2 socat util-linux mount ebtables ethtool init-system-helpers nfs-common ceph-common conntrack glusterfs-client ipset jq cgroupfs-mount git pigz xzutils || exit $ERR_APT_INSTALL_TIMEOUT
+    apt_get_install 20 30 300 apt-transport-https ca-certificates iptables iproute2 socat util-linux mount ebtables ethtool init-system-helpers nfs-common ceph-common conntrack glusterfs-client ipset jq cgroup-lite git pigz xz-utils || exit $ERR_APT_INSTALL_TIMEOUT
 }
 
 function installDocker() {
@@ -316,7 +316,9 @@ function installContainerd() {
 	rm -f "$CONTAINERD_TGZ_TMP"
 
 	echo "Successfully installed cri-containerd..."
-	setupContainerd
+	if [[ "$CONTAINER_RUNTIME" == "clear-containers" ]] || [[ "$CONTAINER_RUNTIME" == "containerd" ]]; then
+		setupContainerd
+	fi
 }
 
 function setupContainerd() {