From ab4987069d13e753d029a29cf1d5caee8b0f4f58 Mon Sep 17 00:00:00 2001 From: "Anton Antonov (TONY)" Date: Fri, 22 Nov 2019 14:56:26 -0800 Subject: [PATCH] Addressing comments --- .../azure-arc-data-controller/README.md | 4 --- samples/features/azure-arc/README.md | 4 +++ .../deployment/README.md | 0 .../deployment/kubeadm/README.md | 0 .../kubeadm/ubuntu-single-node-vm/README.md | 2 +- .../cleanup-controller.sh | 1 - .../ubuntu-single-node-vm/setup-controller.sh | 27 +++++++------------ .../deployment/kubeadm/ubuntu/README.md | 0 .../ubuntu/local-storage-provisioner.yaml | 0 .../deployment/kubeadm/ubuntu/rbac.yaml | 0 10 files changed, 15 insertions(+), 23 deletions(-) delete mode 100644 samples/features/azure-arc-data-controller/README.md create mode 100644 samples/features/azure-arc/README.md rename samples/features/{azure-arc-data-controller => azure-arc}/deployment/README.md (100%) rename samples/features/{azure-arc-data-controller => azure-arc}/deployment/kubeadm/README.md (100%) rename samples/features/{azure-arc-data-controller => azure-arc}/deployment/kubeadm/ubuntu-single-node-vm/README.md (93%) rename samples/features/{azure-arc-data-controller => azure-arc}/deployment/kubeadm/ubuntu-single-node-vm/cleanup-controller.sh (99%) rename samples/features/{azure-arc-data-controller => azure-arc}/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh (87%) rename samples/features/{azure-arc-data-controller => azure-arc}/deployment/kubeadm/ubuntu/README.md (100%) rename samples/features/{azure-arc-data-controller => azure-arc}/deployment/kubeadm/ubuntu/local-storage-provisioner.yaml (100%) rename samples/features/{azure-arc-data-controller => azure-arc}/deployment/kubeadm/ubuntu/rbac.yaml (100%) diff --git a/samples/features/azure-arc-data-controller/README.md b/samples/features/azure-arc-data-controller/README.md deleted file mode 100644 index 6bbbf149..00000000 --- a/samples/features/azure-arc-data-controller/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# Azure Arc Data Controller cluster - -## Samples Setup -Follow the instrutions here: https://raw.githubusercontent.com/ananto-msft/sql-server-samples/master/samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu-single-node-vm/README.md diff --git a/samples/features/azure-arc/README.md b/samples/features/azure-arc/README.md new file mode 100644 index 00000000..2a171069 --- /dev/null +++ b/samples/features/azure-arc/README.md @@ -0,0 +1,4 @@ +# Azure Arc Data Controller cluster + +## __[Sample setup and deployment](deployment/)__ +This folder contains necessary instruction to setup and deploy sample Azure Arc Data Controller cluster. diff --git a/samples/features/azure-arc-data-controller/deployment/README.md b/samples/features/azure-arc/deployment/README.md similarity index 100% rename from samples/features/azure-arc-data-controller/deployment/README.md rename to samples/features/azure-arc/deployment/README.md diff --git a/samples/features/azure-arc-data-controller/deployment/kubeadm/README.md b/samples/features/azure-arc/deployment/kubeadm/README.md similarity index 100% rename from samples/features/azure-arc-data-controller/deployment/kubeadm/README.md rename to samples/features/azure-arc/deployment/kubeadm/README.md diff --git a/samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu-single-node-vm/README.md b/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/README.md similarity index 93% rename from samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu-single-node-vm/README.md rename to samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/README.md index ba028a52..d5568439 100644 --- a/samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu-single-node-vm/README.md +++ b/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/README.md @@ -25,7 +25,7 @@ sudo systemctl reboot 1. Download the script on the VM you are planning to use for the deployment ``` bash -curl --output setup-controller.sh https://raw.githubusercontent.com/ananto-msft/sql-server-samples/master/samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh +curl --output setup-controller.sh https://raw.githubusercontent.com/microsoft/sql-server-samples/master/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh ``` 2. Make the script executable diff --git a/samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu-single-node-vm/cleanup-controller.sh b/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/cleanup-controller.sh similarity index 99% rename from samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu-single-node-vm/cleanup-controller.sh rename to samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/cleanup-controller.sh index ed6dc795..ec100756 100644 --- a/samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu-single-node-vm/cleanup-controller.sh +++ b/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/cleanup-controller.sh @@ -28,7 +28,6 @@ ip link set flannel.1 down iptables -F && iptables -t nat -F && iptables -t mangle -F && iptables -X rm -rf .azdata/ -rm -rf bdcdeploy/ # Remove mounts. # diff --git a/samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh b/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh similarity index 87% rename from samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh rename to samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh index 04b59928..2d4e22b4 100644 --- a/samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh +++ b/samples/features/azure-arc/deployment/kubeadm/ubuntu-single-node-vm/setup-controller.sh @@ -31,22 +31,16 @@ export AZDATA_PRIVATE_PREVIEW_DEB_PACKAGE="https://aka.ms/aadatacontrollerazdata # Kube version. # -KUBE_DPKG_VERSION=1.15.0-00 -KUBE_VERSION=1.15.0 +KUBE_DPKG_VERSION=1.16.3-00 +KUBE_VERSION=1.16.3 # Wait for 5 minutes for the cluster to be ready. # TIMEOUT=600 RETRY_INTERVAL=5 -# Github related contstants -# -GITHUB_AADATACONTROLLER_BRANCH=master - # Variables used for azdata cluster creation. # -export AZDATA_USERNAME=admin -export AZDATA_PASSWORD=$password export DOMAIN_SERVICE_ACCOUNT_USERNAME=admin export DOMAIN_SERVICE_ACCOUNT_PASSWORD=$password @@ -58,7 +52,7 @@ export MSSQL_SA_PASSWORD=$password export KNOX_PASSWORD=$password export ACCEPT_EULA=yes -export CLUSTER_NAME=mssql-cluster +export CLUSTER_NAME=azure-arc-cluster export PV_COUNT="40" # Make a directory for installing the scripts and logs. @@ -69,7 +63,7 @@ cd $AZUREARCDATACONTROLLER_DIR/ touch $LOG_FILE { -# Install all necessary packages: kuberenetes, docker, python3, python3-pip, request, azdata. +# Install all necessary packages: kuberenetes, docker, request, azdata. # echo "" echo "######################################################################################" @@ -187,9 +181,9 @@ sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1 sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1 sudo sysctl -w net.ipv6.conf.lo.disable_ipv6=1 -echo net.ipv6.conf.all.disable_ipv6=1 > /etc/sysctl.conf -echo net.ipv6.conf.default.disable_ipv6=1 > /etc/sysctl.conf -echo net.ipv6.conf.lo.disable_ipv6=1 > /etc/sysctl.conf +echo net.ipv6.conf.all.disable_ipv6=1 >> /etc/sysctl.conf +echo net.ipv6.conf.default.disable_ipv6=1 >> /etc/sysctl.conf +echo net.ipv6.conf.lo.disable_ipv6=1 >> /etc/sysctl.conf sysctl net.bridge.bridge-nf-call-iptables=1 @@ -230,7 +224,7 @@ kubectl taint nodes ${master_node} node-role.kubernetes.io/master:NoSchedule- # Local storage provisioning. # -kubectl apply -f https://raw.githubusercontent.com/ananto-msft/sql-server-samples/$GITHUB_AADATACONTROLLER_BRANCH/samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu/local-storage-provisioner.yaml +kubectl apply -f https://raw.githubusercontent.com/microsoft/sql-server-samples/master/samples/features/azure-arc/deployment/kubeadm/ubuntu/local-storage-provisioner.yaml # Install the software defined network. # @@ -238,7 +232,7 @@ kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/master/Documen # helm init # -kubectl apply -f https://raw.githubusercontent.com/ananto-msft/sql-server-samples/$GITHUB_AADATACONTROLLER_BRANCH/samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu/rbac.yaml +kubectl apply -f https://raw.githubusercontent.com/microsoft/sql-server-samples/master/samples/features/azure-arc/deployment/kubeadm/ubuntu/rbac.yaml # Verify that the cluster is ready to be used. # @@ -279,7 +273,7 @@ echo "Starting to deploy azdata cluster..." # Command to create cluster for single node cluster. # -azdata control create -c tina-kubeadm-private-preview --accept-eula $ACCEPT_EULA +azdata control create -n $CLUSTER_NAME -c azure-arc-data-kubeadm-private-preview --accept-eula $ACCEPT_EULA echo "Azure Arc Data Controller cluster created." # Setting context to cluster. @@ -289,7 +283,6 @@ kubectl config set-context --current --namespace $CLUSTER_NAME # Login and get endpoint list for the cluster. # azdata login -n $CLUSTER_NAME -azdata bdc endpoint list --output table if [ -d "$HOME/.azdata/" ]; then sudo chown -R $(id -u $SUDO_USER):$(id -g $SUDO_USER) $HOME/.azdata/ diff --git a/samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu/README.md b/samples/features/azure-arc/deployment/kubeadm/ubuntu/README.md similarity index 100% rename from samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu/README.md rename to samples/features/azure-arc/deployment/kubeadm/ubuntu/README.md diff --git a/samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu/local-storage-provisioner.yaml b/samples/features/azure-arc/deployment/kubeadm/ubuntu/local-storage-provisioner.yaml similarity index 100% rename from samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu/local-storage-provisioner.yaml rename to samples/features/azure-arc/deployment/kubeadm/ubuntu/local-storage-provisioner.yaml diff --git a/samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu/rbac.yaml b/samples/features/azure-arc/deployment/kubeadm/ubuntu/rbac.yaml similarity index 100% rename from samples/features/azure-arc-data-controller/deployment/kubeadm/ubuntu/rbac.yaml rename to samples/features/azure-arc/deployment/kubeadm/ubuntu/rbac.yaml