From 6b81b829df33199d206ef705042c3f77476d7ae8 Mon Sep 17 00:00:00 2001 From: Sreejith Punnapuzha Date: Thu, 8 Apr 2021 22:26:16 -0500 Subject: [PATCH] Create secret with ssh-key for hostconfig-operator This commit adds secret creation to hostconfig-operator. Signed-off-by: Sreejith Punnapuzha Change-Id: I8a92a07e1aaf653708b6e4d9fa8e300ebb3a9468 (cherry picked from commit 87a82989b6aaee75028b510e28c2a6cff415da8e) --- .../31_deploy_initinfra_target_node.sh | 4 ++++ .../34_deploy_controlplane_target.sh | 22 ++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/tools/deployment/31_deploy_initinfra_target_node.sh b/tools/deployment/31_deploy_initinfra_target_node.sh index 005f99a2a..dc66200ac 100755 --- a/tools/deployment/31_deploy_initinfra_target_node.sh +++ b/tools/deployment/31_deploy_initinfra_target_node.sh @@ -46,6 +46,10 @@ do --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]} node-type=controlplane kubectl \ --kubeconfig $KUBECONFIG \ --context $KUBECONFIG_TARGET_CONTEXT \ diff --git a/tools/deployment/34_deploy_controlplane_target.sh b/tools/deployment/34_deploy_controlplane_target.sh index addfa16e6..843362cff 100755 --- a/tools/deployment/34_deploy_controlplane_target.sh +++ b/tools/deployment/34_deploy_controlplane_target.sh @@ -14,6 +14,8 @@ 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 \ @@ -29,4 +31,22 @@ export TARGET_PORT=${TARGET_PORT:-"$(airshipctl phase render controlplane-target echo $TARGET_IP $TARGET_PORT cd ${AIRSHIPCTL_PROJECT} -./tools/deployment/34_deploy_controlplane_target.sh +./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