Merge pull request #777 from ananto-msft/may-2020

May 2020 update

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 --yes
+azdata extension remove --name azdata-cli-postgres --yes
+azdata extension remove --name azdata-cli-sqlinstance --yes
 unalias azdata
 unalias az
 sudo dpkg --remove --force-all azdata-cli

samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+    #!/bin/bash
 
 # Get controller username and password as input. It is used as default for the controller.
 #
@@ -36,6 +36,38 @@ then
     export DOCKER_PASSWORD=$AADC_PASSWORD
 fi
 
+
+# Propmpt for Arc Data Controller properties.
+#
+if [ -z "$ARC_DC_NAME" ]
+then
+    read -p "Enter a name for the new Azure Arc Data Controller: " dc_name
+    echo
+    export ARC_DC_NAME=$dc_name
+fi
+
+if [ -z "$ARC_DC_SUBSCRIPTION" ]
+then
+    read -p "Enter a subscription ID for the new Azure Arc Data Controller: " dc_subscription
+    echo
+    export ARC_DC_SUBSCRIPTION=$dc_subscription
+fi
+
+if [ -z "$ARC_DC_RG" ]
+then
+    read -p "Enter a resource group for the new Azure Arc Data Controller: " dc_rg
+    echo
+    export ARC_DC_RG=$dc_rg
+fi
+
+if [ -z "$ARC_DC_REGION" ]
+then
+    read -p "Enter a region for the new Azure Arc Data Controller (eastus or eastus2): " dc_region
+    echo
+    export ARC_DC_REGION=$dc_region
+fi
+
+
 set -Eeuo pipefail
 
 # This is a script to create single-node Kubernetes cluster and deploy Azure Arc Data Controller on it.
@@ -49,7 +81,7 @@ export DEBIAN_FRONTEND=noninteractive
 
 # Requirements file.
 export OSCODENAME=$(lsb_release -cs)
-export AZDATA_PRIVATE_PREVIEW_DEB_PACKAGE="https://aka.ms/mar-2020-azdata-"$OSCODENAME
+export AZDATA_PRIVATE_PREVIEW_DEB_PACKAGE="https://private-repo.microsoft.com/python/azure-arc-data/private-preview-may-2020/ubuntu-"$OSCODENAME"/azdata-cli_15.0.4033-1~"$OSCODENAME"_all.deb"
 
 # Kube version.
 #
@@ -123,6 +155,19 @@ cd -
 azdata --version
 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_sqlinstance-0.0.1-py2.py3-none-any.whl --yes
+
+echo "Azdata extensions installed successfully."
+
 # Install Azure CLI
 #
 curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash
@@ -134,8 +179,6 @@ echo "Starting to setup pre-requisites for kubernetes..."
 
 # Setup the kubernetes preprequisites.
 #
-echo $(hostname -i) $(hostname) >> sudo tee -a /etc/hosts
-
 sudo swapoff -a
 sudo sed -i '/swap/s/^\(.*\)$/#\1/g' /etc/fstab
 
@@ -290,7 +333,13 @@ 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 config init -s azure-arc-kubeadm-private-preview -t azure-arc-custom --force
+azdata arc dc config replace --config-file azure-arc-custom/control.json --json-values '$.spec.dataController.displayName=$ARC_DC_NAME'
+azdata arc dc config replace --config-file azure-arc-custom/control.json --json-values '$.spec.dataController.subscription=$ARC_DC_SUBSCRIPTION'
+azdata arc dc config replace --config-file azure-arc-custom/control.json --json-values '$.spec.dataController.resourceGroup=$ARC_DC_RG'
+azdata arc dc config replace --config-file azure-arc-custom/control.json --json-values '$.spec.dataController.location=$ARC_DC_REGION'
+
+azdata arc dc create -n $CLUSTER_NAME -c azure-arc-custom --accept-eula $ACCEPT_EULA
 echo "Azure Arc Data Controller cluster created." 
 
 # Setting context to cluster.