From ad5fabe0d63a86501d88013ef0e75395c3d10020 Mon Sep 17 00:00:00 2001
From: James Gu <james.gu@att.com>
Date: Mon, 12 Apr 2021 17:49:09 -0700
Subject: [PATCH] Add script for controlplane_target phase

controlplane_target phase is required for multi-node target cluster.

Signed-off-by: James Gu <james.gu@att.com>
Change-Id: I2af1c815588c1ad457b59af8f2f0cb515ba33ce6
---
 .../34_deploy_controlplane_target.sh          | 34 +------------------
 tools/deployment/35_deploy_worker_node.sh     | 26 +++-----------
 2 files changed, 5 insertions(+), 55 deletions(-)

diff --git a/tools/deployment/34_deploy_controlplane_target.sh b/tools/deployment/34_deploy_controlplane_target.sh
index 843362cff..b7d88e296 100755
--- a/tools/deployment/34_deploy_controlplane_target.sh
+++ b/tools/deployment/34_deploy_controlplane_target.sh
@@ -14,39 +14,7 @@
 
 set -ex
 
-export KUBECONFIG=${KUBECONFIG:-"$HOME/.airship/kubeconfig"}
-export KUBECONFIG_TARGET_CONTEXT=${KUBECONFIG_TARGET_CONTEXT:-"target-cluster"}
 : ${AIRSHIPCTL_PROJECT:="../airshipctl"}
 
-export TARGET_IP=${TARGET_IP:-"$(airshipctl phase render controlplane-target \
-	-k Metal3Cluster \
-	-l airshipit.org/stage=initinfra \
-       	2> /dev/null | \
-	yq .spec.controlPlaneEndpoint.host |
-	sed 's/"//g')"}
-export TARGET_PORT=${TARGET_PORT:-"$(airshipctl phase render controlplane-target \
-	-k Metal3Cluster -l airshipit.org/stage=initinfra \
-       	2> /dev/null | \
-	yq .spec.controlPlaneEndpoint.port)"}
-
-echo $TARGET_IP $TARGET_PORT
 cd ${AIRSHIPCTL_PROJECT}
-./tools/deployment/34_deploy_worker_node.sh
-
-hosts=$(kubectl \
-  --kubeconfig $KUBECONFIG \
-  --context $KUBECONFIG_TARGET_CONTEXT \
-  --request-timeout 10s get nodes -o name)
-
-# Annotate node for hostconfig-operator
-for i in "${!hosts[@]}"
-do
-    kubectl \
-      --kubeconfig $KUBECONFIG \
-      --context $KUBECONFIG_TARGET_CONTEXT \
-      --request-timeout 10s annotate ${hosts[i]} secret=hco-ssh-auth
-    kubectl \
-      --kubeconfig $KUBECONFIG \
-      --context $KUBECONFIG_TARGET_CONTEXT \
-      --request-timeout 10s label ${hosts[i]} kubernetes.io/role=master
-done
+./tools/deployment/34_deploy_controlplane_target.sh
diff --git a/tools/deployment/35_deploy_worker_node.sh b/tools/deployment/35_deploy_worker_node.sh
index 698f86033..50f4c5ef1 100755
--- a/tools/deployment/35_deploy_worker_node.sh
+++ b/tools/deployment/35_deploy_worker_node.sh
@@ -23,31 +23,13 @@ export WORKER_NODE=${WORKER_NODE:-"$(airshipctl phase render workers-target \
 	yq .metadata.name | \
 	sed 's/"//g')"}
 
-# Annotate node for hostconfig-operator
-hosts=$(kubectl \
-  --kubeconfig $KUBECONFIG \
-  --context $KUBECONFIG_TARGET_CONTEXT \
-  --request-timeout 10s get nodes -o name)
-
-for i in "${!hosts[@]}"
-do
-    kubectl \
-      --kubeconfig $KUBECONFIG \
-      --context $KUBECONFIG_TARGET_CONTEXT \
-      --request-timeout 10s annotate --overwrite ${hosts[i]} secret=hco-ssh-auth
-    kubectl \
-      --kubeconfig $KUBECONFIG \
-      --context $KUBECONFIG_TARGET_CONTEXT \
-      --request-timeout 10s label --overwrite ${hosts[i]} kubernetes.io/role=master
-done
-
 cd ${AIRSHIPCTL_PROJECT}
 ./tools/deployment/35_deploy_worker_node.sh
 
-hosts=$(kubectl \
+hosts=$(`kubectl \
   --kubeconfig $KUBECONFIG \
   --context $KUBECONFIG_TARGET_CONTEXT \
-  --request-timeout 10s get nodes -o name)
+  --request-timeout 10s get nodes -o name`)
 
 # Annotate node for hostconfig-operator
 for i in "${!hosts[@]}"
@@ -55,9 +37,9 @@ do
     kubectl \
       --kubeconfig $KUBECONFIG \
       --context $KUBECONFIG_TARGET_CONTEXT \
-      --request-timeout 10s annotate --overwrite ${hosts[i]} secret=hco-ssh-auth
+      --request-timeout 10s annotate ${hosts[i]} secret=hco-ssh-auth
     kubectl \
       --kubeconfig $KUBECONFIG \
       --context $KUBECONFIG_TARGET_CONTEXT \
-      --request-timeout 10s label --overwrite ${hosts[i]} kubernetes.io/role=master
+      --request-timeout 10s label ${hosts[i]} kubernetes.io/role=master
 done