Merge "Fix deployment scripts"
This commit is contained in:
commit
3e5795c0d1
|
@ -22,7 +22,7 @@ cd ${AIRSHIPCTL_PROJECT}
|
||||||
|
|
||||||
./tools/deployment/31_deploy_initinfra_target_node.sh
|
./tools/deployment/31_deploy_initinfra_target_node.sh
|
||||||
|
|
||||||
hosts=(kubectl \
|
hosts=$(kubectl \
|
||||||
--kubeconfig $KUBECONFIG \
|
--kubeconfig $KUBECONFIG \
|
||||||
--context $KUBECONFIG_TARGET_CONTEXT \
|
--context $KUBECONFIG_TARGET_CONTEXT \
|
||||||
--request-timeout 10s get nodes -o name)
|
--request-timeout 10s get nodes -o name)
|
||||||
|
@ -33,11 +33,7 @@ do
|
||||||
kubectl \
|
kubectl \
|
||||||
--kubeconfig $KUBECONFIG \
|
--kubeconfig $KUBECONFIG \
|
||||||
--context $KUBECONFIG_TARGET_CONTEXT \
|
--context $KUBECONFIG_TARGET_CONTEXT \
|
||||||
--request-timeout 10s annotate ${hosts[i]} secret=hco-ssh-auth
|
--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 \
|
kubectl \
|
||||||
--kubeconfig $KUBECONFIG \
|
--kubeconfig $KUBECONFIG \
|
||||||
--context $KUBECONFIG_TARGET_CONTEXT \
|
--context $KUBECONFIG_TARGET_CONTEXT \
|
||||||
|
|
|
@ -18,6 +18,11 @@ export KUBECONFIG=${KUBECONFIG:-"$HOME/.airship/kubeconfig"}
|
||||||
export KUBECONFIG_TARGET_CONTEXT=${KUBECONFIG_TARGET_CONTEXT:-"target-cluster"}
|
export KUBECONFIG_TARGET_CONTEXT=${KUBECONFIG_TARGET_CONTEXT:-"target-cluster"}
|
||||||
: ${AIRSHIPCTL_PROJECT:="../airshipctl"}
|
: ${AIRSHIPCTL_PROJECT:="../airshipctl"}
|
||||||
|
|
||||||
|
export WORKER_NODE=${WORKER_NODE:-"$(airshipctl phase render workers-target \
|
||||||
|
-k BareMetalHost 2> /dev/null | \
|
||||||
|
yq .metadata.name | \
|
||||||
|
sed 's/"//g')"}
|
||||||
|
|
||||||
# Annotate node for hostconfig-operator
|
# Annotate node for hostconfig-operator
|
||||||
hosts=(kubectl \
|
hosts=(kubectl \
|
||||||
--kubeconfig $KUBECONFIG \
|
--kubeconfig $KUBECONFIG \
|
||||||
|
@ -29,11 +34,7 @@ do
|
||||||
kubectl \
|
kubectl \
|
||||||
--kubeconfig $KUBECONFIG \
|
--kubeconfig $KUBECONFIG \
|
||||||
--context $KUBECONFIG_TARGET_CONTEXT \
|
--context $KUBECONFIG_TARGET_CONTEXT \
|
||||||
--request-timeout 10s annotate ${hosts[i]} secret=hco-ssh-auth
|
--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 \
|
kubectl \
|
||||||
--kubeconfig $KUBECONFIG \
|
--kubeconfig $KUBECONFIG \
|
||||||
--context $KUBECONFIG_TARGET_CONTEXT \
|
--context $KUBECONFIG_TARGET_CONTEXT \
|
||||||
|
@ -43,7 +44,7 @@ done
|
||||||
cd ${AIRSHIPCTL_PROJECT}
|
cd ${AIRSHIPCTL_PROJECT}
|
||||||
./tools/deployment/35_deploy_worker_node.sh
|
./tools/deployment/35_deploy_worker_node.sh
|
||||||
|
|
||||||
hosts=(kubectl \
|
hosts=$(kubectl \
|
||||||
--kubeconfig $KUBECONFIG \
|
--kubeconfig $KUBECONFIG \
|
||||||
--context $KUBECONFIG_TARGET_CONTEXT \
|
--context $KUBECONFIG_TARGET_CONTEXT \
|
||||||
--request-timeout 10s get nodes -o name)
|
--request-timeout 10s get nodes -o name)
|
||||||
|
@ -54,7 +55,7 @@ do
|
||||||
kubectl \
|
kubectl \
|
||||||
--kubeconfig $KUBECONFIG \
|
--kubeconfig $KUBECONFIG \
|
||||||
--context $KUBECONFIG_TARGET_CONTEXT \
|
--context $KUBECONFIG_TARGET_CONTEXT \
|
||||||
--request-timeout 10s annotate ${hosts[i]} secret=hco-ssh-auth
|
--request-timeout 10s annotate --overwrite ${hosts[i]} secret=hco-ssh-auth
|
||||||
kubectl \
|
kubectl \
|
||||||
--kubeconfig $KUBECONFIG \
|
--kubeconfig $KUBECONFIG \
|
||||||
--context $KUBECONFIG_TARGET_CONTEXT \
|
--context $KUBECONFIG_TARGET_CONTEXT \
|
||||||
|
|
Loading…
Reference in New Issue