Enabled SQL MIAA deployment in direct mode (#17874)

* Added customlocation, location, resource group, and connection mode to controllerinfo. Updated SQL MIAA create notebook with direct mode params.

* Removed annotations from metadata in postgres test file.

* Only parse the customlocation if the connection mode is direct.

Co-authored-by: Candice Ye <canye@microsoft.com>
This commit is contained in:
Candice Ye
2021-12-09 12:14:31 -08:00
committed by GitHub
parent 46fc807b69
commit 0ec2974aa4
7 changed files with 53 additions and 5 deletions

View File

@@ -98,6 +98,18 @@
"source": [
"print (f'Creating the SQL managed instance - Azure Arc instance')\n",
"\n",
"is_indirect = arc_data_controller_connection_mode == 'indirect'\n",
"\n",
"# Indirect Mode Parameters\n",
"namespace = f' --k8s-namespace {arc_data_controller_namespace}' if is_indirect else ''\n",
"use_k8s = ' --use-k8s' if is_indirect else ''\n",
"\n",
"# Direct Mode Parameters\n",
"resource_group = f' --resource-group {arc_data_controller_resource_group}' if not is_indirect else ''\n",
"custom_location = f' --custom-location {arc_data_controller_custom_location}' if not is_indirect else ''\n",
"location = f' --location {arc_data_controller_location}' if not is_indirect else ''\n",
"\n",
"# General Parameters\n",
"cores_request_option = f' --cores-request \"{sql_cores_request}\"' if sql_cores_request else \"\"\n",
"cores_limit_option = f' --cores-limit \"{sql_cores_limit}\"' if sql_cores_limit else \"\"\n",
"memory_request_option = f' --memory-request \"{sql_memory_request}Gi\"' if sql_memory_request else \"\"\n",
@@ -121,7 +133,7 @@
"\n",
"os.environ[\"AZDATA_USERNAME\"] = sql_username\n",
"os.environ[\"AZDATA_PASSWORD\"] = os.environ[\"AZDATA_NB_VAR_SQL_PASSWORD\"]\n",
"cmd = f'az sql mi-arc create --name {sql_instance_name} --k8s-namespace {arc_data_controller_namespace} --replicas {sql_replicas}{cores_request_option}{cores_limit_option}{memory_request_option}{memory_limit_option}{storage_class_data_option}{storage_class_datalogs_option}{storage_class_logs_option}{storage_class_backup_option}{volume_size_data}{volume_size_datalogs}{volume_size_logs}{volume_size_backups}{retention_days}{service_tier}{dev_use}{license_type}{cores_limit} --use-k8s'\n",
"cmd = f'az sql mi-arc create --name {sql_instance_name}{namespace}{resource_group}{location}{custom_location} --replicas {sql_replicas}{cores_request_option}{cores_limit_option}{memory_request_option}{memory_limit_option}{storage_class_data_option}{storage_class_datalogs_option}{storage_class_logs_option}{storage_class_backup_option}{volume_size_data}{volume_size_datalogs}{volume_size_logs}{volume_size_backups}{retention_days}{service_tier}{dev_use}{license_type}{cores_limit}{use_k8s}'\n",
"out=run_command()"
]
}