adding bpa features and required build components

Change-Id: Ie88a6339c0652b41d3fe03ac340b4965ef1d465c

diff --git a/Makefile b/Makefile
index 567ea2e..977aac9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,9 @@
 SHELL:=/bin/bash
 BMDIR:=$(CURDIR)/env/metal3
 METAL3DIR:=$(CURDIR)/deploy/metal3/scripts
+BPA_OPERATOR:=$(CURDIR)/cmd/bpa-operator/
+KUD_PATH:=$(CURDIR)/deploy/kud
+
 all: bm_install
 
 bm_preinstall:
@@ -9,4 +12,14 @@ bm_preinstall:
 bm_install:
        pushd $(METAL3DIR) && ./metal3.sh && popd 
 
+bm_all: bm_preinstall bm_install
+
+kud_download:
+       pushd $(KUD_PATH) && ./kud_launch.sh && popd
+
+bpa_op_install: kud_download
+       pushd $(BPA_OPERATOR) && ./bpa_operator_launch.sh && popd
+
+bpa_op_all: bm_all bpa_op_install      
+
 .PHONY: all bm_preinstall bm_install

diff --git a/cmd/bpa-operator/bpa_operator_launch.sh b/cmd/bpa-operator/bpa_operator_launch.sh
index 8f01718..7152fc2 100755 (executable)
--- a/cmd/bpa-operator/bpa_operator_launch.sh
+++ b/cmd/bpa-operator/bpa_operator_launch.sh
@@ -3,9 +3,18 @@
 #Get Go ENV variables
 eval "$(go env)"
 
+export GO111MODULE=on
+go get -d github.com/operator-framework/operator-sdk # This will download the git repository and not install it
+pushd $GOPATH/src/github.com/operator-framework/operator-sdk
+git checkout master
+make tidy
+make install
+popd
+
 #Copy bpa operator directory to the right path
+kubectl create -f $PWD/deploy/crds/bpa_v1alpha1_provisioning_crd.yaml 
 echo $GOPATH
-mkdir -p $GOPATH/github.com/ && cp -r $PWD/cmd/bpa-operator $GOPATH/github.com/bpa-operator
-pushd $GOPATH/github.com/bpa-operator
+mkdir -p $GOPATH/src/github.com/ && cp -r $PWD $GOPATH/src/github.com/bpa-operator
+pushd $GOPATH/src/github.com/bpa-operator
 operator-sdk up local --kubeconfig $HOME/.kube/config
 popd

diff --git a/cmd/bpa-operator/go.mod b/cmd/bpa-operator/go.mod
index 7e753d5..086123d 100644 (file)
--- a/cmd/bpa-operator/go.mod
+++ b/cmd/bpa-operator/go.mod
@@ -2,7 +2,7 @@ module github.com/bpa-operator
 
 require (
        github.com/NYTimes/gziphandler v1.0.1 // indirect
-       github.com/operator-framework/operator-sdk v0.9.1-0.20190806161443-d3a37c1ec2c5
+       github.com/operator-framework/operator-sdk v0.10.0
        github.com/spf13/pflag v1.0.3
        gopkg.in/ini.v1 v1.46.0
        k8s.io/api v0.0.0-20190612125737-db0771252981

diff --git a/deploy/kud/kud_launch.sh b/deploy/kud/kud_launch.sh
new file mode 100755 (executable)
index 0000000..85adc6e
--- /dev/null
+++ b/deploy/kud/kud_launch.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+if [ ! -d $(PWD)/multicloud-k8s]; then
+       git clone https://github.com/onap/multicloud-k8s.git
+fi
+

diff --git a/env/metal3/01_install_package.sh b/env/metal3/01_install_package.sh
index 36beb04..3798c0f 100755 (executable)
--- a/env/metal3/01_install_package.sh
+++ b/env/metal3/01_install_package.sh
@@ -18,7 +18,6 @@ function install_essential_packages() {
                curl \
                dnsmasq \
                figlet \
-               golang \
                nmap \
                patch \
                psmisc \
@@ -26,7 +25,13 @@ function install_essential_packages() {
                python-requests \
                python-setuptools \
                vim \
-               wget
+               wget \
+               git \
+               software-properties-common
+
+       add-apt-repository ppa:longsleep/golang-backports
+       apt-get update
+       apt-get install golang-go
 }
 
 function install_ironic_packages() {