X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ric-infra%2F00-Kubernetes%2Fheat%2Fscripts%2Fk8s_vm_install.sh;h=e1e96150ffecb5d5e4b6a43dc8333f4ee8caadfd;hb=0309475769b27702c8c886411222882da8b519b1;hp=54dbc3ec15f07f927a54f2973f0adac218e3de7f;hpb=88657efe9e96a83cda32bf8c642d1dd03013aad2;p=it%2Fdep.git diff --git a/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh b/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh index 54dbc3ec..e1e96150 100644 --- a/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh +++ b/ric-infra/00-Kubernetes/heat/scripts/k8s_vm_install.sh @@ -121,7 +121,7 @@ KUBECNIV=$(cat /opt/config/k8s_cni_version.txt) KUBEVERSION="${KUBEV}-00" CNIVERSION="${KUBECNIV}-00" -DOCKERVERSION="${DOCKERV}-0ubuntu1.2~16.04.1" +DOCKERVERSION="${DOCKERV}" curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - echo 'deb http://apt.kubernetes.io/ kubernetes-xenial main' > /etc/apt/sources.list.d/kubernetes.list @@ -130,7 +130,7 @@ apt-get update apt-get install -y linux-image-4.15.0-45-lowlatency curl jq netcat docker.io=${DOCKERVERSION} apt-get install -y kubernetes-cni=${CNIVERSION} apt-get install -y --allow-unauthenticated kubeadm=${KUBEVERSION} kubelet=${KUBEVERSION} kubectl=${KUBEVERSION} -apt-mark hold kubernetes-cni kubelet kubeadm kubectl +apt-mark hold docker.io kubernetes-cni kubelet kubeadm kubectl # test access to k8s docker registry @@ -264,9 +264,6 @@ EOF sleep 15 done - # install ingress controller db-less kong - helm install stable/kong --set ingressController.enabled=true --set postgresql.enabled=false --set env.database=off - echo "Starting an NC TCP server on port 29999 to indicate we are ready" nc -l -p 29999 &