airship/airshipctl
Code Issues Proposed changes

Update common provider script

Browse Source 
Updated env variable TEST_SITE to SITE to remove
error with capd deployment
Updated scripts to use phase "initinfra-networking" for deploying
calico cni in target cluster

Change-Id: Ib372e8fe8d1124aa83c5e69a861c523a967c22c9
This commit is contained in:
Ratnopam Chakrabarti 2021-01-11 14:05:36 -05:00
parent e2af947337
commit 670658958b
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/deployment/provider_common/30_deploy_controlplane.sh
View File

@ -14,7 +14,7 @@
# Example Usage # Example Usage
# CONTROLPLANE_COUNT=1 \ # CONTROLPLANE_COUNT=1 \
# TEST_SITE=docker-test-site \ # SITE=docker-test-site \
# ./tools/deployment/provider_common/30_deploy_controlplane.sh # ./tools/deployment/provider_common/30_deploy_controlplane.sh
export AIRSHIP_SRC=${AIRSHIP_SRC:-"/tmp/airship"} export AIRSHIP_SRC=${AIRSHIP_SRC:-"/tmp/airship"}
@ -49,20 +49,13 @@ echo "add context target-cluster"
kubectl config set-context ${TARGET_CLUSTER_NAME} --user ${TARGET_CLUSTER_NAME}-admin --cluster ${TARGET_CLUSTER_NAME} \ kubectl config set-context ${TARGET_CLUSTER_NAME} --user ${TARGET_CLUSTER_NAME}-admin --cluster ${TARGET_CLUSTER_NAME} \
--kubeconfig "/tmp/${TARGET_CLUSTER_NAME}.kubeconfig" --kubeconfig "/tmp/${TARGET_CLUSTER_NAME}.kubeconfig"
if [ "$TEST_SITE" != "docker-test-site" ]; then echo "apply cni as a part of initinfra-networking"
echo "apply cni as a part of initinfra" airshipctl phase run initinfra-networking-target --debug --kubeconfig "/tmp/${TARGET_CLUSTER_NAME}.kubeconfig"
airshipctl phase run initinfra-target --debug --kubeconfig "/tmp/${TARGET_CLUSTER_NAME}.kubeconfig"
kubectl --kubeconfig /tmp/"${TARGET_CLUSTER_NAME}".kubeconfig wait --for=condition=Ready nodes --all --timeout 4000s
else
kubectl --kubeconfig /tmp/"${TARGET_CLUSTER_NAME}".kubeconfig wait --for=condition=Ready nodes --all --timeout 4000s
fi
echo "Check nodes status" echo "Check nodes status"
kubectl --kubeconfig /tmp/"${TARGET_CLUSTER_NAME}".kubeconfig wait --for=condition=Ready nodes --all --timeout 4000s kubectl --kubeconfig /tmp/"${TARGET_CLUSTER_NAME}".kubeconfig wait --for=condition=Ready nodes --all --timeout 4000s
kubectl get nodes --kubeconfig /tmp/"${TARGET_CLUSTER_NAME}".kubeconfig kubectl get nodes --kubeconfig /tmp/"${TARGET_CLUSTER_NAME}".kubeconfig
echo "Waiting for pods to come up" echo "Waiting for pods to come up"
kubectl --kubeconfig /tmp/${TARGET_CLUSTER_NAME}.kubeconfig wait --for=condition=ready pods --all --timeout=4000s -A kubectl --kubeconfig /tmp/${TARGET_CLUSTER_NAME}.kubeconfig wait --for=condition=ready pods --all --timeout=4000s -A
kubectl --kubeconfig /tmp/${TARGET_CLUSTER_NAME}.kubeconfig get pods -A kubectl --kubeconfig /tmp/${TARGET_CLUSTER_NAME}.kubeconfig get pods -A

2
tools/deployment/provider_common/34_deploy_worker_node.sh
View File

@ -15,7 +15,7 @@
set -xe set -xe
# Example Usage # Example Usage
# TEST_SITE=docker-test-site \ # SITE=docker-test-site \
# WORKERS_COUNT=3 ./tools/deployment/provider_common/34_deploy_worker_node.sh # WORKERS_COUNT=3 ./tools/deployment/provider_common/34_deploy_worker_node.sh
export KUBECONFIG=${KUBECONFIG:-"$HOME/.airship/kubeconfig"} export KUBECONFIG=${KUBECONFIG:-"$HOME/.airship/kubeconfig"}