summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Hu <bin.hu@att.com>2018-10-02 02:05:34 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-02 02:05:34 +0000
commit3d18e1efb262fb6619f139ac640dac795dcf0d54 (patch)
treef1280a37db582fca14a52a0ddfe63476910bff67
parent6dac5862d3d1c6f98e70b7f20b93c9be8ce20afe (diff)
parent3a726acfc600538f09636a99232adc84095cdb31 (diff)
Merge "Fix build.sh deployment script"
-rwxr-xr-xdeployments/build.sh3
-rw-r--r--src/k8splugin/Gopkg.lock3
2 files changed, 4 insertions, 2 deletions
diff --git a/deployments/build.sh b/deployments/build.sh
index 3a6ea856..a1f093a7 100755
--- a/deployments/build.sh
+++ b/deployments/build.sh
@@ -11,7 +11,10 @@
set -o nounset
set -o pipefail
+source /etc/environment
+
k8s_path="$(git rev-parse --show-toplevel)"
+export GOPATH=$k8s_path
echo "Compiling source code"
pushd $k8s_path/src/k8splugin/
diff --git a/src/k8splugin/Gopkg.lock b/src/k8splugin/Gopkg.lock
index 4ccf69ea..26ada7aa 100644
--- a/src/k8splugin/Gopkg.lock
+++ b/src/k8splugin/Gopkg.lock
@@ -452,11 +452,10 @@
"k8s.io/api/apps/v1",
"k8s.io/api/core/v1",
"k8s.io/apimachinery/pkg/apis/meta/v1",
+ "k8s.io/apimachinery/pkg/runtime",
"k8s.io/client-go/kubernetes",
"k8s.io/client-go/kubernetes/fake",
"k8s.io/client-go/kubernetes/scheme",
- "k8s.io/client-go/kubernetes/typed/apps/v1",
- "k8s.io/client-go/kubernetes/typed/core/v1",
"k8s.io/client-go/tools/clientcmd",
"k8s.io/client-go/util/homedir",
]