Merge "Adding CustomResourceDefinition Job and StatefulSet."

[ric-plt/ric-dep.git] / bin / install_k8s_and_helm.sh

diff --git a/bin/install_k8s_and_helm.sh b/bin/install_k8s_and_helm.sh
index 84bed9a..f1873bc 100755 (executable)
--- a/bin/install_k8s_and_helm.sh
+++ b/bin/install_k8s_and_helm.sh
@@ -64,7 +64,7 @@ start_ipv6_if () {
 KUBEV="1.16.0"
 KUBECNIV="0.7.5"
 HELMV="3.5.4"
-DOCKERV="20.10.12"
+DOCKERV="20.10.21"
 
 echo running ${0}
 while getopts ":k:d:e:n:c" o; do
@@ -170,7 +170,7 @@ elif [[ ${UBUNTU_RELEASE} == 18.* ]]; then
 elif [[ ${UBUNTU_RELEASE} == 20.* ]]; then
   echo "Installing on Ubuntu $UBUNTU_RELEASE (Focal Fossal)"
   if [ ! -z "${DOCKERV}" ]; then
-    DOCKERVERSION="${DOCKERV}-0ubuntu2~20.04.1"  # 20.10.12-0ubuntu2~20.04.1
+    DOCKERVERSION="${DOCKERV}-0ubuntu1~20.04.2"  # 20.10.21-0ubuntu1~20.04.2
   fi
 else
   echo "Unsupported Ubuntu release ($UBUNTU_RELEASE) detected.  Exit."
@@ -338,7 +338,8 @@ EOF
 
   kubectl get pods --all-namespaces
 
-  kubectl apply -f "https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml"
+  # we refer to version 0.18.1 because later versions use namespace kube-flannel instead of kube-system TODO
+  kubectl apply -f "https://raw.githubusercontent.com/flannel-io/flannel/v0.18.1/Documentation/kube-flannel.yml"
 
   wait_for_pods_running 8 kube-system