Fixed comments/readme

samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/cleanup-bdc.sh

@@ -7,6 +7,7 @@ fi
 DIR_PREFIX=$1
 
 kubeadm reset --force
+unalias azdata
 
 systemctl stop kubelet
 rm -rf /var/lib/cni/
@@ -14,7 +15,8 @@ rm -rf /var/lib/etcd/
 rm -rf /run/flannel/
 rm -rf /var/lib/kubelet/*
 rm -rf /etc/cni/
-rm -rf /etc/kubernetes/*
+rm -rf /etc/kubernetes/
+
 ip link set cni0 down
 #brctl delbr cni0
 ip link set flannel.1 down
@@ -22,7 +24,10 @@ 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.
+#
 SERVICE_STOP_FAILED=0
 
 systemctl | grep "/var/lib/kubelet/pods" | while read -r line; do
@@ -58,6 +63,9 @@ else
     echo "All orphaned services successfully stopped."
 fi
 
+# Clean the mounted volumes.
+#
+
 for i in $(seq 1 30); do
 
   vol="vol$i"
@@ -68,8 +76,12 @@ for i in $(seq 1 30); do
 
 done
 
-
-kubeadm reset -y
-sudo apt-get -y purge kubeadm kubectl kubelet kubernetes-cni kube*
-sudo apt-get autoremove
+# Reset kube
+#
+sudo apt-get purge -y kubeadm --allow-change-held-packages 
+sudo apt-get purge -y kubectl --allow-change-held-packages
+sudo apt-get purge -y kubelet --allow-change-held-packages
+sudo apt-get purge -y kubernetes-cni --allow-change-held-packages
+sudo apt-get purge -y kube* --allow-change-held-packages
+sudo apt -y autoremove
 sudo rm -rf ~/.kube

samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu-single-node-vm/setup-bdc.sh

@@ -10,7 +10,7 @@ fi
 #
 export BDCDEPLOY_DIR=bdcdeploy
 
-# Get password as input. It is used as default for controller, SQL Server Master instance (sa account) and knox.
+# Get password as input. It is used as default for controller, SQL Server Master instance (sa account) and Knox.
 #
 while true; do
     read -s -p "Create Password for Big Data Cluster: " password
@@ -333,5 +333,4 @@ if [ -d "$HOME/.azdata/" ]; then
 fi
 
 echo "alias azdata='$BDCDEPLOY_DIR/$VIRTUALENV_NAME/bin/azdata'" >> $HOME/.bashrc
-source ~/.bashrc
 }| tee $LOG_FILE

samples/features/sql-big-data-cluster/deployment/kubeadm/ubuntu/README.md

@@ -1,11 +1,10 @@
 # Create a Kubernetes cluster using Kubeadm on Ubuntu 16.04 LTS or 18.04 LTS
 
-
 In this example, we will deploy Kubernetes over multiple Linux machines (physical or virtualized) using kubeadm utility. These instructions have been tested primarily with Ubuntu 16.04 LTS & 18.04 LTS versions.
 
 ## Pre-requisites
 
-1. Multiple Linux machines or virtual machines. Recommended configuration is 8 CPUs, 32 GB memory each and at least 100 GB storage for each machine. Minimum number of machines required is three machines
+1. Multiple Ubuntu Linux machines or virtual machines. Recommended configuration is 8 CPUs, 32 GB memory each and at least 100 GB storage for each machine. Minimum number of machines required is three machines
 1. Designate one machine as the Kubernetes master
 1. Rest of the machines will be used as the Kubernetes agents
 
@@ -22,9 +21,9 @@ In this example, we will deploy Kubernetes over multiple Linux machines (physica
 ### Instructions
 
 1. Start a sudo shell context
-1. Execute [ubuntu/setup-k8s-prereqs.sh](ubuntu/setup-k8s-prereqs.sh/) script on each machine
-1. Execute [ubuntu/setup-k8s-master.sh](ubuntu/setup-k8s-master.sh/) script on the machine designated as Kubernetes master
+1. Execute [setup-k8s-prereqs.sh](setup-k8s-prereqs.sh/) script on each machine
+1. Execute [setup-k8s-master.sh](setup-k8s-master.sh/) script on the machine designated as Kubernetes master
 1. After successful initialization of the Kubernetes master, follow the kubeadm join commands output by the setup script on each agent machine
-1. Execute [ubuntu/setup-volumes-agent.sh](ubuntu/setup-volumes-agent.sh/) script on each agent machine to create volumes for local storage
-1. Execute ***kubectl apply -f ubuntu/local-storage-provisioner.yaml*** against the Kubernetes cluster to create the local storage provisioner.
+1. Execute [setup-volumes-agent.sh](setup-volumes-agent.sh/) script on each agent machine to create volumes for local storage
+1. Execute ***kubectl apply -f local-storage-provisioner.yaml*** against the Kubernetes cluster to create the local storage provisioner.
 1. Now, you can deploy the SQL Server 2019 big data cluster following instructions [here](https://docs.microsoft.com/en-us/sql/big-data-cluster/deployment-guidance?view=sqlallproducts-allversions)