From 0a4f18b34fe4612eefa3d4ea3655ab9d446b209b Mon Sep 17 00:00:00 2001 From: Bill Liang Date: Thu, 21 May 2020 22:56:57 -0700 Subject: [PATCH] fix setup and cleanup scripts --- .../kubeadm/ubuntu-single-node-vm/cleanup-controller.sh | 3 +++ .../kubeadm/ubuntu-single-node-vm/setup-controller.sh | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/cleanup-controller.sh b/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/cleanup-controller.sh index 0d3ccd2e..9bc9d1ea 100644 --- a/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/cleanup-controller.sh +++ b/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/cleanup-controller.sh @@ -6,6 +6,9 @@ sudo kubeadm reset --force # Clean up azdata-cli package. # +azdata extension remove --name azdata-cli-dc +azdata extension remove --name azdata-cli-postgres +azdata extension remove --name azdata-cli-sqlinstance unalias azdata unalias az sudo dpkg --remove --force-all azdata-cli diff --git a/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh b/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh index 09b433bf..5aacea1a 100644 --- a/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh +++ b/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh @@ -125,11 +125,15 @@ echo "Azdata has been successfully installed." # Installing azdata extensions # +echo "Installing azdata extension for Arc data controller..." +azdata extension add --source https://private-repo.microsoft.com/python/azure-arc-data/private-preview-may-2020/pypi-azdata-cli-extensions/azdata_cli_dc-0.0.1-py2.py3-none-any.whl --yes + echo "Installing azdata extension for postgres..." azdata extension add --source https://private-repo.microsoft.com/python/azure-arc-data/private-preview-may-2020/pypi-azdata-cli-extensions/azdata_cli_postgres-0.0.1-py2.py3-none-any.whl --yes echo "Installing azdata extension for sql..." -azdata extension add --source https://private-repo.microsoft.com/python/azure-arc-data/private-preview-may-2020/pypi-azdata-cli-extensions/azdata_cli_hybrid-0.0.1-py2.py3-none-any.whl --yes +azdata extension add --source https://private-repo.microsoft.com/python/azure-arc-data/private-preview-may-2020/pypi-azdata-cli-extensions/azdata_cli_sqlinstance-0.0.1-py2.py3-none-any.whl --yes + echo "Azdata extensions installed successfully." # Install Azure CLI @@ -299,7 +303,7 @@ echo "Starting to deploy azdata cluster..." # Command to create cluster for single node cluster. # -azdata control create -n $CLUSTER_NAME -c azure-arc-kubeadm-private-preview --accept-eula $ACCEPT_EULA +azdata arc dc create -n $CLUSTER_NAME -c azure-arc-kubeadm-private-preview --accept-eula $ACCEPT_EULA echo "Azure Arc Data Controller cluster created." # Setting context to cluster.