From a75a89a046c58126f29500cddc7b8617d0777670 Mon Sep 17 00:00:00 2001
From: Lusheng Ji <lji@research.att.com>
Date: Tue, 12 May 2020 17:20:54 -0400
Subject: [PATCH] Further fixes for running ONAP Frankfurt

Change-Id: Iebf7eaf53094792be7a2e3bcb9ad9388b0dc4b15
Signed-off-by: Lusheng Ji <lji@research.att.com>
---
 tools/k8s/etc/infra.rc                   | 11 ++++++++++-
 tools/k8s/heat/scripts/k8s_vm_install.sh | 15 ++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/tools/k8s/etc/infra.rc b/tools/k8s/etc/infra.rc
index 1b3da348..1e90a93c 100644
--- a/tools/k8s/etc/infra.rc
+++ b/tools/k8s/etc/infra.rc
@@ -1,7 +1,16 @@
 # modify below for RIC infrastructure (docker-k8s-helm) component versions
+# RIC tested
 INFRA_DOCKER_VERSION=""
+INFRA_HELM_VERSION="2.12.3"
 INFRA_K8S_VERSION="1.16.0"
 INFRA_CNI_VERSION="0.7.5"
+# older RIC tested
+#INFRA_DOCKER_VERSION=""
+#INFRA_HELM_VERSION="2.12.3"
 #INFRA_K8S_VERSION="1.13.3"
 #INFRA_CNI_VERSION="0.6.0"
-INFRA_HELM_VERSION="2.12.3"
+# ONAP Frankfurt
+#INFRA_DOCKER_VERSION="18.09.7"
+#INFRA_K8S_VERSION="1.15.9"
+#INFRA_CNI_VERSION="0.7.5"
+#INFRA_HELM_VERSION="2.16.6"
diff --git a/tools/k8s/heat/scripts/k8s_vm_install.sh b/tools/k8s/heat/scripts/k8s_vm_install.sh
index 8b8f62de..1ecdb188 100644
--- a/tools/k8s/heat/scripts/k8s_vm_install.sh
+++ b/tools/k8s/heat/scripts/k8s_vm_install.sh
@@ -131,7 +131,7 @@ if [[ ${UBUNTU_RELEASE} == 16.* ]]; then
 elif [[ ${UBUNTU_RELEASE} == 18.* ]]; then
   echo "Installing on Ubuntu $UBUNTU_RELEASE (Bionic Beaver)"
   if [ ! -z "${DOCKERV}" ]; then
-    DOCKERVERSION="${DOCKERV}-0ubuntu1~18.04.5"
+    DOCKERVERSION="${DOCKERV}-0ubuntu1~18.04.4"
   fi
 else
   echo "Unsupported Ubuntu release ($UBUNTU_RELEASE) detected.  Exit."
@@ -148,8 +148,7 @@ echo "APT::Acquire::Retries \"3\";" > /etc/apt/apt.conf.d/80-retries
 
 # install low latency kernel, docker.io, and kubernetes
 apt-get update
-
-RES=$(apt-get install -y virt-what curl jq netcat make 2>&1)
+RES=$(apt-get install -y virt-what curl jq netcat make ipset 2>&1)
 if [[ $RES == */var/lib/dpkg/lock* ]]; then
   echo "Fail to get dpkg lock.  Wait for any other package installation"
   echo "process to finish, then rerun this script"
@@ -260,7 +259,7 @@ apiVersion: kubeproxy.config.k8s.io/v1alpha1
 kind: KubeProxyConfiguration
 mode: ipvs
 EOF
-  elif [[ ${KUBEV} == 1.16.* ]]; then
+  elif [[ ${KUBEV} == 1.15.* ]] || [[ ${KUBEV} == 1.16.* ]]; then
     cat <<EOF >/root/config.yaml
 apiVersion: kubeadm.k8s.io/v1beta2
 kubernetesVersion: v${KUBEV}
@@ -314,7 +313,8 @@ EOF
   mkdir -p .kube
   cp -i /etc/kubernetes/admin.conf /root/.kube/config
   chown root:root /root/.kube/config
-  export KUBECONFIG=/root/.kube/config 
+  export KUBECONFIG=/root/.kube/config
+  echo "KUBECONFIG=${KUBECONFIG}" >> /etc/environment
 
   # at this point we should be able to use kubectl
   kubectl get pods --all-namespaces
@@ -354,7 +354,8 @@ EOF
     helm init --service-account tiller
   fi
   helm init -c
-  export HELM_HOME="/root/.helm"
+  export HELM_HOME="$(pwd)/.helm"
+  echo "HELM_HOME=${HELM_HOME}" >> /etc/environment
 
   # waiting for tiller pod to be in running state
   while ! helm version; do
@@ -404,4 +405,4 @@ EOF
   docker pull ${__RUNRICENV_DOCKER_HOST__}:${__RUNRICENV_DOCKER_PORT__}/whoami:0.0.1
 fi
 
-if [ "$(uname -r)" != "4.15.0-45-lowlatency" ]; then reboot; fi
\ No newline at end of file
+if [ "$(uname -r)" != "4.15.0-45-lowlatency" ]; then reboot; fi
-- 
2.16.6