airship
/
treasuremap
Code Issues Proposed changes

Remove labeling from scripts 

This commit removes assigning labels from deployment scripts. Labeling
will be managed via KubeadmControlPlane templates.

Signed-off-by: Sreejith Punnapuzha <Sreejith.Punnapuzha@outlook.com>
Change-Id: I17ebd6663663b6e456e9e968a9f1468295c6232c
This commit is contained in:
Sreejith Punnapuzha 2021-05-15 22:39:06 -05:00
parent 20a013f9df
commit 761b1b049f
2 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/deployment/31_deploy_initinfra_target_node.sh
View File

@ -26,12 +26,6 @@ TARGET_NODE=${TARGET_NODE:-"$(airshipctl phase render controlplane-ephemeral \
cd ${AIRSHIPCTL_PROJECT}
kubectl \
--kubeconfig $KUBECONFIG \
--context $KUBECONFIG_TARGET_CONTEXT \
--request-timeout 10s \
label --overwrite nodes $TARGET_NODE node-type=controlplane
./tools/deployment/31_deploy_initinfra_target_node.sh
hosts=$(kubectl \
@ -46,12 +40,4 @@ 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 \
--request-timeout 10s label --overwrite ${hosts[i]} kubernetes.io/role=master
done

26
tools/deployment/35_deploy_worker_node.sh
View File

@ -23,28 +23,6 @@ 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]} node-type=controlplane
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
@ -60,8 +38,4 @@ 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]} kubernetes.io/role=master
done