Merge branch 'master' of https://github.com/Microsoft/sql-server-samples

Author: pmasl

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

@@ -45,5 +45,5 @@ When prompted, provide your input for Azure subscription ID, Azure resource grou
 - vm_size - we recommend to use a VM size to accommodate your workload. For an optimal experience while you are validating basic scenarios, we recommend at least 8 vCPUs and 64GB memory across all agent nodes in the cluster. The script uses **Standard_L8s** as default. A default size configuration also uses about 24 disks for persistent volume claims across all components.
 - aks_node_count - this is the number of the worker nodes for the AKS cluster, excluding master node. The script is using a default of 1 agent node. This is the minimum required for this VM size to have enough resources and disks to provision all the necessary persistent volumes.
 - cluster_name - this value is used for both AKS cluster and SQL big data cluster created on top of AKS. Note that the name of the SQL big data cluster is going to be a Kubernetes namespace
-- password - same value is going to be used for all accounts that require user password input: SQL Server master instance SA account, controller user and Knox user
-- controller_username - this is the username for the cluster admin account
+- password - same value is going to be used for all accounts that require user password input: SQL Server master instance account created for the below **username**, controller user and Knox **root** user
+- username - this is the username for the accounts provisioned during deployment for the controller admin account and SQL Server master instance account. Note that **sa** SQL Server account is disabled automatically for you, as a best practice. Username for Knox gateway account is going to be **root**.

samples/features/sql-big-data-cluster/deployment/aks/deploy-sql-big-data-aks.py

@@ -40,8 +40,8 @@ def executeCmd (cmd):
 
 #This password will be use for Controller user, Knox user and SQL Server Master SA accounts
 # 
-CONTROLLER_USERNAME=input("Provide username to be used for Controller user - Press ENTER for using  `admin`:").strip() or "admin"
-PASSWORD = getpass.getpass("Provide password to be used for Controller user, Knox user and SQL Server Master SA accounts - Press ENTER for using  `MySQLBigData2019`").strip() or "MySQLBigData2019"
+AZDATA_USERNAME=input("Provide username to be used for Controller and SQL Server master accounts - Press ENTER for using  `admin`:").strip() or "admin"
+AZDATA_PASSWORD = getpass.getpass("Provide password to be used for Controller user, Knox user (root) and SQL Server Master accounts - Press ENTER for using  `MySQLBigData2019`").strip() or "MySQLBigData2019"
 
 # Docker registry details
 # Use this only if you are using a private registry different than mcr. If so, make sure you are also setting the environment variables for DOCKER_USERNAME and DOCKER_PASSWORD
@@ -50,10 +50,8 @@ def executeCmd (cmd):
 # DOCKER_IMAGE_TAG="<your Docker image tag>"
 
 print ('Setting environment variables')
-os.environ['MSSQL_SA_PASSWORD'] = PASSWORD
-os.environ['CONTROLLER_USERNAME'] = CONTROLLER_USERNAME
-os.environ['CONTROLLER_PASSWORD'] = PASSWORD
-os.environ['KNOX_PASSWORD'] = PASSWORD
+os.environ['AZDATA_PASSWORD'] = AZDATA_PASSWORD
+os.environ['AZDATA_USERNAME'] = AZDATA_USERNAME
 # Use this only if you are using a private registry different than mcr. If so, you must set the environment variables for DOCKER_USERNAME and DOCKER_PASSWORD
 # os.environ['DOCKER_USERNAME']=DOCKER_USERNAME
 # os.environ['DOCKER_PASSWORD']=DOCKER_PASSWORD
@@ -68,7 +66,7 @@ def executeCmd (cmd):
 executeCmd (command)
 
 print("Creating AKS cluster: "+CLUSTER_NAME)
-command = "az aks create --name "+CLUSTER_NAME+" --resource-group "+GROUP_NAME+" --generate-ssh-keys --node-vm-size "+VM_SIZE+" --node-count "+AKS_NODE_COUNT+" --kubernetes-version 1.13.10"
+command = "az aks create --name "+CLUSTER_NAME+" --resource-group "+GROUP_NAME+" --generate-ssh-keys --node-vm-size "+VM_SIZE+" --node-count "+AKS_NODE_COUNT
 executeCmd (command)
 
 command = "az aks get-credentials --overwrite-existing --name "+CLUSTER_NAME+" --resource-group "+GROUP_NAME+" --admin"

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

@@ -46,14 +46,12 @@ RETRY_INTERVAL=5
 #
 export DOCKER_REGISTRY="mcr.microsoft.com"
 export DOCKER_REPOSITORY="mssql/bdc"
-export DOCKER_TAG="2019-RC1-ubuntu"
+export DOCKER_TAG="2019-GDR1-ubuntu-16.04"
 
 # Variables used for azdata cluster creation.
 #
-export CONTROLLER_USERNAME=admin
-export CONTROLLER_PASSWORD=$password
-export MSSQL_SA_PASSWORD=$password
-export KNOX_PASSWORD=$password
+export AZDATA_USERNAME=admin
+export AZDATA_PASSWORD=$password
 export ACCEPT_EULA=yes
 export CLUSTER_NAME=mssql-cluster
 export STORAGE_CLASS=local-storage
@@ -81,7 +79,8 @@ IMAGES=(
         mssql-server
         mssql-server-controller
         mssql-server-data
-        mssql-server-ha
+        mssql-ha-operator
+	mssql-ha-supervisor
         mssql-service-proxy
         mssql-ssis-app-runtime
 )
@@ -125,6 +124,9 @@ usermod --append --groups docker $USER
 #
 apt-get install -q -y python3 
 apt-get install -q -y python3-pip
+apt-get install -y libkrb5-dev
+apt-get install -y libsqlite3-dev
+apt-get install -y unixodbc-dev
 
 pip3 install requests --upgrade
 

samples/features/sql-big-data-cluster/deployment/offline/push-bdc-images-to-custom-private-repo.py

@@ -47,7 +47,8 @@ def execute_cmd (cmd):
            'mssql-server'
            'mssql-server-controller'
            'mssql-server-data'
-           'mssql-server-ha'
+           'mssql-ha-operator'
+           'mssql-ha-supervisor'
            'mssql-service-proxy'
            'mssql-ssis-app-runtime']