From 42f8f006ab01692d7de9cecc06521eaf58743c0d Mon Sep 17 00:00:00 2001 From: Kiran Kamineni Date: Thu, 18 Apr 2019 16:38:20 -0700 Subject: Move configuration into config files Move k8splugin configuration into config files instead of using environment variables. Issue-ID: MULTICLOUD-579 Change-Id: I7b76d5a14d24f002a8db484097a31fb5e908b6f8 Signed-off-by: Kiran Kamineni --- deployments/start.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) (limited to 'deployments') diff --git a/deployments/start.sh b/deployments/start.sh index 233e0282..f8dc8e7f 100755 --- a/deployments/start.sh +++ b/deployments/start.sh @@ -15,19 +15,25 @@ source /etc/environment k8s_path="$(git rev-parse --show-toplevel)" export GOPATH=$k8s_path - -export DATABASE_TYPE=mongo -export PLUGINS_DIR=$k8s_path/src/k8splugin/plugins +export GO111MODULE=on echo "Starting mongo services" docker-compose kill docker-compose up -d mongo export DATABASE_IP=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $(docker ps -aqf "name=mongo")) -export no_proxy=$no_proxy,$DATABASE_IP -export NO_PROXY=$NO_PROXY,$DATABASE_IP +export no_proxy=${no_proxy:-},$DATABASE_IP +export NO_PROXY=${NO_PROXY:-},$DATABASE_IP echo "Compiling source code" pushd $k8s_path/src/k8splugin/ -make plugins -env GO111MODULE=on go run cmd/main.go +cat << EOF > k8sconfig.json +{ + "database-address": "$DATABASE_IP", + "database-type": "mongo", + "plugin-dir": "$(pwd)/plugins", + "kube-config-dir": "$(pwd)/kubeconfigs" +} +EOF +make all +./k8plugin popd -- cgit 1.2.3-korg