From: r.kuralamudhan <kuralamudhan.ramakrishnan@intel.com>
Date: Tue, 31 Mar 2020 19:01:31 +0000 (-0700)
Subject: adding version control for metal3 projects
X-Git-Tag: v0.4.0~33
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=dbe6c38bfefe85d957147789ce7a809e20879ea9;p=icn.git

adding version control for metal3 projects

Issue-ID: ICN-319
Signed-off-by: Kuralamudhan Ramakrishnan <kuralamudhan.ramakrishnan@gmail.com>
Change-Id: I472eb01c85896a8f038411493273ba143ed710cc
---

diff --git a/deploy/metal3/scripts/01_metal3.sh b/deploy/metal3/scripts/01_metal3.sh
index 75719e3..b922a90 100755
--- a/deploy/metal3/scripts/01_metal3.sh
+++ b/deploy/metal3/scripts/01_metal3.sh
@@ -93,32 +93,44 @@ function create_userdata {
 }
 
 function launch_baremetal_operator {
-    if [ ! -d $GOPATH/src/github.com/metal3-io/baremetal-operator ]; then
-        go get github.com/metal3-io/baremetal-operator
-        git checkout 3d40caa29dce82878d83aeb7f8dab4dc4a856160
+    if [ -d $GOPATH/src/github.com/metal3-io/baremetal-operator ]; then
+        rm -rf $GOPATH/src/github.com/metal3-io/baremetal-operator
     fi
 
-    pushd $GOPATH/src/github.com/metal3-io/baremetal-operator
-    docker pull quay.io/metal3-io/baremetal-operator:master
-    make deploy
+    docker pull integratedcloudnative/baremetal-operator:v1.0-icn
+    docker tag integratedcloudnative/baremetal-operator:v1.0-icn \
+        quay.io/metal3-io/baremetal-operator:master
+
+    mkdir -p $GOPATH/src/github.com/metal3-io
+    pushd $GOPATH/src/github.com/metal3-io
+    git clone --single-branch --branch v1.0-icn \
+        https://github.com/akraino-icn/baremetal-operator.git
+    kubectl apply -f baremetal-operator/deploy/namespace/namespace.yaml
+    kubectl apply -f baremetal-operator/deploy/rbac/service_account.yaml -n metal3
+    kubectl apply -f baremetal-operator/deploy/rbac/role.yaml -n metal3
+    kubectl apply -f baremetal-operator/deploy/rbac/role_binding.yaml
+    kubectl apply -f baremetal-operator/deploy/crds/metal3.io_baremetalhosts_crd.yaml
+    kubectl apply -f baremetal-operator/deploy/operator/no_ironic/operator.yaml -n metal3
     popd
 }
 
 function remove_baremetal_operator {
     if [ ! -d $GOPATH/src/github.com/metal3-io/baremetal-operator ]; then
-        go get github.com/metal3-io/baremetal-operator
-        git checkout 3d40caa29dce82878d83aeb7f8dab4dc4a856160
+        pushd $GOPATH/src/github.com/metal3-io
+        git clone --single-branch --branch v1.0-icn \
+		https://github.com/akraino-icn/baremetal-operator.git
+        popd
     fi
 
-    pushd $GOPATH/src/github.com/metal3-io/baremetal-operator
-        kubectl delete -f deploy/operator.yaml -n metal3
-        kubectl delete -f deploy/crds/metal3_v1alpha1_baremetalhost_crd.yaml
-        kubectl delete -f deploy/role_binding.yaml
-        kubectl delete -f deploy/role.yaml -n metal3
-        kubectl delete -f deploy/service_account.yaml -n metal3
-        kubectl delete ns metal3
-        docker rmi quay.io/metal3-io/baremetal-operator:master
+    pushd $GOPATH/src/github.com/metal3-io
+    kubectl delete -f baremetal-operator/deploy/operator/no_ironic/operator.yaml -n metal3
+    kubectl delete -f baremetal-operator/deploy/crds/metal3.io_baremetalhosts_crd.yaml
+    kubectl delete -f baremetal-operator/deploy/rbac/role_binding.yaml
+    kubectl delete -f baremetal-operator/deploy/rbac/role.yaml -n metal3
+    kubectl delete -f baremetal-operator/deploy/rbac/service_account.yaml -n metal3
+    kubectl delete -f baremetal-operator/deploy/namespace/namespace.yaml
     popd
+    rm -rf $GOPATH/src/github.com/metal3-io/baremetal-operator
 }
 
 function network_config_files {
@@ -210,11 +222,25 @@ function cleanup {
         kubectl delete bmh $name -n metal3
         kubectl delete secrets $name-bmc-secret -n metal3
         kubectl delete secrets $name-user-data -n metal3
+        if [ -f $name-bm-node.yaml ]; then
+            rm -rf $name-bm-node.yaml
+        fi
+
+        if [ -f $name-user-data-credential.yaml ]; then
+            rm -rf $name-user-data-credential.yaml
+        fi
+
+        if [ -f $name-userdata.yaml ]; then
+            rm -rf $name-userdata.yaml
+        fi
     done
 }
 
 function clean_all {
     list_nodes | cleanup
+    if [ -f $IRONIC_DATA_DIR/nodes.json ]; then
+        rm -rf $IRONIC_DATA_DIR/nodes.json
+    fi
 }
 
 function apply_bm_hosts {
diff --git a/env/lib/common.sh b/env/lib/common.sh
index 4bc2bd4..195c807 100755
--- a/env/lib/common.sh
+++ b/env/lib/common.sh
@@ -26,10 +26,10 @@ PROVIDER_NETWORK_GATEWAY=${PROVIDER_NETWORK_GATEWAY:-}
 PROVIDER_NETWORK_DNS=${PROVIDER_NETWORK_DNS:-}
 
 #Ironic variables
-IRONIC_IMAGE=${IRONIC_IMAGE:-"quay.io/metal3-io/ironic:master"}
-IRONIC_INSPECTOR_IMAGE=${IRONIC_INSPECTOR_IMAGE:-"quay.io/metal3-io/ironic-inspector"}
-IRONIC_BAREMETAL_IMAGE=${IRONIC_BAREMETAL_IMAGE:-"quay.io/metal3-io/baremetal-operator:master"}
-IPA_DOWNLOADER_IMAGE=${IPA_DOWNLOADER_IMAGE:-"quay.io/metal3-io/ironic-ipa-downloader:master"}
+IRONIC_IMAGE=${IRONIC_IMAGE:-"integratedcloudnative/ironic:v1.0-icn"}
+IRONIC_INSPECTOR_IMAGE=${IRONIC_INSPECTOR_IMAGE:-"integratedcloudnative/ironic-inspector:v1.0-icn"}
+IRONIC_BAREMETAL_IMAGE=${IRONIC_BAREMETAL_IMAGE:-"integratedcloudnative/baremetal-operator:v1.0-icn"}
+IPA_DOWNLOADER_IMAGE=${IPA_DOWNLOADER_IMAGE:-"integratedcloudnative/ironic-ipa-downloader:v1.0-icn"}
 IRONIC_BAREMETAL_SOCAT_IMAGE=${IRONIC_BAREMETAL_SOCAT_IMAGE:-"alpine/socat:latest"}
 
 IRONIC_DATA_DIR=${IRONIC_DATA_DIR:-"/opt/ironic"}