Set 30080 port for Kubernetes Dashboard

[multicloud/k8s.git] / vagrant / installer.sh

diff --git a/vagrant/installer.sh b/vagrant/installer.sh
index f6f2f76..f3f11a7 100755 (executable)
--- a/vagrant/installer.sh
+++ b/vagrant/installer.sh
@@ -181,36 +181,25 @@ function install_plugin {
     if [[ -n "${testing_enabled+x}" ]]; then
         docker-compose up -d
         pushd $krd_tests
-        bash plugin.sh
+        for functional_test in plugin plugin_edgex; do
+            bash ${functional_test}.sh
+        done
         popd
     fi
     popd
 }
 
-# _install_crictl() - Install Container Runtime Interface (CRI) CLI
-function _install_crictl {
-    local version="v1.0.0-alpha.0" # More info: https://github.com/kubernetes-incubator/cri-tools#current-status
-
-    wget https://github.com/kubernetes-incubator/cri-tools/releases/download/$version/crictl-$version-linux-amd64.tar.gz
-    tar zxvf crictl-$version-linux-amd64.tar.gz -C /usr/local/bin
-    rm -f crictl-$version-linux-amd64.tar.gz
-
-    cat << EOL > /etc/crictl.yaml
-runtime-endpoint: unix:///run/criproxy.sock
-image-endpoint: unix:///run/criproxy.sock
-EOL
-}
-
 # _print_kubernetes_info() - Prints the login Kubernetes information
 function _print_kubernetes_info {
     if ! $(kubectl version &>/dev/null); then
         return
     fi
     # Expose Dashboard using NodePort
+    node_port=30080
     KUBE_EDITOR="sed -i \"s|type\: ClusterIP|type\: NodePort|g\"" kubectl -n kube-system edit service kubernetes-dashboard
+    KUBE_EDITOR="sed -i \"s|nodePort\: .*|nodePort\: $node_port|g\"" kubectl -n kube-system edit service kubernetes-dashboard
 
     master_ip=$(kubectl cluster-info | grep "Kubernetes master" | awk -F ":" '{print $2}')
-    node_port=$(kubectl get service -n kube-system | grep kubernetes-dashboard | awk '{print $5}' |awk -F "[:/]" '{print $2}')
 
     printf "Kubernetes Info\n===============\n" > $k8s_info_file
     echo "Dashboard URL: https:$master_ip:$node_port" >> $k8s_info_file
@@ -219,7 +208,7 @@ function _print_kubernetes_info {
 }
 
 # Configuration values
-addons="virtlet ovn-kubernetes multus nfd"
+addons="virtlet ovn-kubernetes multus"
 krd_folder="$(dirname "$0")"
 verbose=""