From 6cf246db2d14fc1b20798132162b93ff5b507f12 Mon Sep 17 00:00:00 2001 From: ananto-msft <57770929+ananto-msft@users.noreply.github.com> Date: Fri, 1 May 2020 15:43:32 -0700 Subject: [PATCH 01/12] Update setup-controller.sh --- .../kubeadm/ubuntu-single-node-vm/setup-controller.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ca86fd4a..f6ef2c7b 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 @@ -49,7 +49,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://aka.ms/apr-2020-azdata-"$OSCODENAME # Kube version. # From 466111523468bab125a26d2b7b2c38b4c4dc103b Mon Sep 17 00:00:00 2001 From: ananto-msft <57770929+ananto-msft@users.noreply.github.com> Date: Mon, 4 May 2020 09:20:22 -0700 Subject: [PATCH 02/12] Installing azdata extensions after azdata install Installing azdata extensions after azdata install --- .../kubeadm/ubuntu-single-node-vm/setup-controller.sh | 9 +++++++++ 1 file changed, 9 insertions(+) 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 f6ef2c7b..0e5e591b 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 @@ -123,6 +123,15 @@ cd - azdata --version echo "Azdata has been successfully installed." +# Installing azdata extensions +# +echo "Installing azdata extension for postgres..." +azdata extension add --source http://host-to/azdata_cli_postgres-0.0.1-py2.py3-none-any.whl + +echo "Installing azdata extension for sql..." +azdata extension add --source http://host-to/azdata_cli_hybrid-0.0.1-py2.py3-none-any.whl +echo "Azdata extensions installed successfully." + # Install Azure CLI # curl -sL https://aka.ms/InstallAzureCLIDeb | sudo bash From 07c5bb3a38dd38c235121c64874d1e1fb3b9a832 Mon Sep 17 00:00:00 2001 From: ananto-msft <57770929+ananto-msft@users.noreply.github.com> Date: Mon, 4 May 2020 09:28:49 -0700 Subject: [PATCH 03/12] Fixing the URLs for extensions. Fixing the URLs for extensions. --- .../kubeadm/ubuntu-single-node-vm/setup-controller.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 0e5e591b..2b025f7d 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 @@ -126,10 +126,10 @@ echo "Azdata has been successfully installed." # Installing azdata extensions # echo "Installing azdata extension for postgres..." -azdata extension add --source http://host-to/azdata_cli_postgres-0.0.1-py2.py3-none-any.whl +azdata extension add --source https://private-repo.microsoft.com/python/azure-arc-data/private-preview-apr-2020/pypi-azdata-cli-extensions/azdata_cli_postgres-0.0.1-py2.py3-none-any.whl echo "Installing azdata extension for sql..." -azdata extension add --source http://host-to/azdata_cli_hybrid-0.0.1-py2.py3-none-any.whl +azdata extension add --source https://private-repo.microsoft.com/python/azure-arc-data/private-preview-apr-2020/pypi-azdata-cli-extensions/azdata_cli_hybrid-0.0.1-py2.py3-none-any.whl echo "Azdata extensions installed successfully." # Install Azure CLI From 0aa5dea09d257220e5c22e572929bf8c2ccb55bb Mon Sep 17 00:00:00 2001 From: ananto-msft <57770929+ananto-msft@users.noreply.github.com> Date: Mon, 4 May 2020 09:57:09 -0700 Subject: [PATCH 04/12] Accept flag for whatever it is... Accept flag for whatever it is... --- .../kubeadm/ubuntu-single-node-vm/setup-controller.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 2b025f7d..1f99f4a6 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 @@ -126,10 +126,10 @@ echo "Azdata has been successfully installed." # Installing azdata extensions # echo "Installing azdata extension for postgres..." -azdata extension add --source https://private-repo.microsoft.com/python/azure-arc-data/private-preview-apr-2020/pypi-azdata-cli-extensions/azdata_cli_postgres-0.0.1-py2.py3-none-any.whl +azdata extension add --source https://private-repo.microsoft.com/python/azure-arc-data/private-preview-apr-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-apr-2020/pypi-azdata-cli-extensions/azdata_cli_hybrid-0.0.1-py2.py3-none-any.whl +azdata extension add --source https://private-repo.microsoft.com/python/azure-arc-data/private-preview-apr-2020/pypi-azdata-cli-extensions/azdata_cli_hybrid-0.0.1-py2.py3-none-any.whl --yes echo "Azdata extensions installed successfully." # Install Azure CLI From 5ba81586ca37be5fd2fe4ee92aa27539f6b21541 Mon Sep 17 00:00:00 2001 From: Bill Liang Date: Mon, 4 May 2020 14:43:12 -0700 Subject: [PATCH 05/12] added dep libdns-export162 --- .../kubeadm/ubuntu-single-node-vm/setup-controller.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1f99f4a6..fb4710f8 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 @@ -110,7 +110,7 @@ cd setupscript/ # Download and install azdata prerequisites # -sudo apt install -y libodbc1 odbcinst odbcinst1debian2 unixodbc apt-transport-https libkrb5-dev +sudo apt install -y libodbc1 odbcinst odbcinst1debian2 unixodbc apt-transport-https libkrb5-dev libdns-export162 # Download and install azdata package # From 55c4c35ae8de10a43f375111d8e3cc1b4b8d2b6e Mon Sep 17 00:00:00 2001 From: Bill Liang Date: Tue, 5 May 2020 13:55:29 -0700 Subject: [PATCH 06/12] Revert "added dep libdns-export162" This reverts commit 5ba81586ca37be5fd2fe4ee92aa27539f6b21541. --- .../kubeadm/ubuntu-single-node-vm/setup-controller.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fb4710f8..1f99f4a6 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 @@ -110,7 +110,7 @@ cd setupscript/ # Download and install azdata prerequisites # -sudo apt install -y libodbc1 odbcinst odbcinst1debian2 unixodbc apt-transport-https libkrb5-dev libdns-export162 +sudo apt install -y libodbc1 odbcinst odbcinst1debian2 unixodbc apt-transport-https libkrb5-dev # Download and install azdata package # From c0dc5699137dbed14c0c0e2c2ccf99cf3aa30e6c Mon Sep 17 00:00:00 2001 From: Bill Liang Date: Fri, 15 May 2020 13:42:45 -0700 Subject: [PATCH 07/12] May update --- .../kubeadm/ubuntu-single-node-vm/setup-controller.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 1f99f4a6..09b433bf 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 @@ -49,7 +49,7 @@ export DEBIAN_FRONTEND=noninteractive # Requirements file. export OSCODENAME=$(lsb_release -cs) -export AZDATA_PRIVATE_PREVIEW_DEB_PACKAGE="https://aka.ms/apr-2020-azdata-"$OSCODENAME +export AZDATA_PRIVATE_PREVIEW_DEB_PACKAGE="https://aka.ms/may-2020-azdata-"$OSCODENAME # Kube version. # @@ -126,10 +126,10 @@ echo "Azdata has been successfully installed." # Installing azdata extensions # echo "Installing azdata extension for postgres..." -azdata extension add --source https://private-repo.microsoft.com/python/azure-arc-data/private-preview-apr-2020/pypi-azdata-cli-extensions/azdata_cli_postgres-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_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-apr-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_hybrid-0.0.1-py2.py3-none-any.whl --yes echo "Azdata extensions installed successfully." # Install Azure CLI From 0a4f18b34fe4612eefa3d4ea3655ab9d446b209b Mon Sep 17 00:00:00 2001 From: Bill Liang Date: Thu, 21 May 2020 22:56:57 -0700 Subject: [PATCH 08/12] 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. From 91e4b0b2f275c0457c739ea0aa8d6bb3dd1820fd Mon Sep 17 00:00:00 2001 From: Bill Liang Date: Tue, 26 May 2020 16:40:19 -0700 Subject: [PATCH 09/12] added prompt for DC properties --- .../ubuntu-single-node-vm/setup-controller.sh | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) 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 5aacea1a..7adfa5b5 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 @@ -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. @@ -303,7 +335,13 @@ echo "Starting to deploy azdata cluster..." # Command to create cluster for single node cluster. # -azdata arc dc 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. From 1b80c431373341b9fb73b6f181ab992f733dc908 Mon Sep 17 00:00:00 2001 From: Bill Liang Date: Thu, 28 May 2020 09:07:01 -0700 Subject: [PATCH 10/12] yes to extension remove --- .../kubeadm/ubuntu-single-node-vm/cleanup-controller.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 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 9bc9d1ea..9dca7dac 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,9 +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 +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 From 1c9671f4e02e46da58fe801f1c54267d07d40356 Mon Sep 17 00:00:00 2001 From: Bill Liang Date: Thu, 28 May 2020 16:22:52 -0700 Subject: [PATCH 11/12] removed unnecessary command --- .../kubeadm/ubuntu-single-node-vm/setup-controller.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) 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 7adfa5b5..bb5b04c3 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 @@ -1,4 +1,4 @@ -#!/bin/bash + #!/bin/bash # Get controller username and password as input. It is used as default for the controller. # @@ -179,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 From 0d435074a3cc42db9c37d3f8ff155e8cb2cbd3c7 Mon Sep 17 00:00:00 2001 From: Bill Liang Date: Mon, 1 Jun 2020 16:24:41 -0700 Subject: [PATCH 12/12] direct download from private-repo.microsoft.com/python/azure-arc-data --- .../kubeadm/ubuntu-single-node-vm/setup-controller.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 bb5b04c3..bb65b60f 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 @@ -81,7 +81,7 @@ export DEBIAN_FRONTEND=noninteractive # Requirements file. export OSCODENAME=$(lsb_release -cs) -export AZDATA_PRIVATE_PREVIEW_DEB_PACKAGE="https://aka.ms/may-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. #