summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Morales <victor.morales@intel.com>2018-10-01 02:25:27 -0700
committerVictor Morales <victor.morales@intel.com>2018-10-01 02:25:27 -0700
commit3a726acfc600538f09636a99232adc84095cdb31 (patch)
treeaf194bbff08462b7905e14dae9302c25dcd42fbd
parent145648701486244f632cc6aaaa0f70a252db829a (diff)
Fix build.sh deployment script
The build.sh file didn't include the GOPATH variable which in some cases was causing some building failures. This change includes a source instruction at beginining of the file. Change-Id: I718411fd90ede74decbaac7efc5c065aa5a853fc Signed-off-by: Victor Morales <victor.morales@intel.com> Issue-ID: MULTICLOUD-301
-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",
]