ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove MIAA Port Deploy Option (#12388)

Browse Source
This commit is contained in:
Chris LaFreniere
2020-09-16 22:56:51 -07:00
committed by GitHub
parent 0cd242cd0c
commit be1e0b3c8d
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb
View File

@@ -147,7 +147,6 @@
{ {
"cell_type": "code", "cell_type": "code",
"source": [ "source": [
"sql_instance_port = os.environ.get(\"AZDATA_NB_VAR_SQL_INSTANCE_PORT\")\n",
"sql_instance_cores_request = os.environ.get(\"AZDATA_NB_VAR_SQL_CORES_REQUEST\")\n", "sql_instance_cores_request = os.environ.get(\"AZDATA_NB_VAR_SQL_CORES_REQUEST\")\n",
"sql_instance_cores_limit = os.environ.get(\"AZDATA_NB_VAR_SQL_CORES_LIMIT\")\n", "sql_instance_cores_limit = os.environ.get(\"AZDATA_NB_VAR_SQL_CORES_LIMIT\")\n",
"sql_instance_memory_request = os.environ.get(\"AZDATA_NB_VAR_SQL_MEMORY_REQUEST\")\n", "sql_instance_memory_request = os.environ.get(\"AZDATA_NB_VAR_SQL_MEMORY_REQUEST\")\n",
@@ -188,14 +187,13 @@
"source": [ "source": [
"print (f'Creating Managed SQL Server instance on Azure Arc')\n", "print (f'Creating Managed SQL Server instance on Azure Arc')\n",
"\n", "\n",
"port_option = f' --port \"{sql_instance_port}\"' if sql_instance_port else \"\"\n",
"cores_request_option = f' -cr \"{sql_instance_cores_request}\"' if sql_instance_cores_request else \"\"\n", "cores_request_option = f' -cr \"{sql_instance_cores_request}\"' if sql_instance_cores_request else \"\"\n",
"cores_limit_option = f' -cl \"{sql_instance_cores_limit}\"' if sql_instance_cores_limit else \"\"\n", "cores_limit_option = f' -cl \"{sql_instance_cores_limit}\"' if sql_instance_cores_limit else \"\"\n",
"memory_request_option = f' -mr \"{sql_instance_memory_request}Mi\"' if sql_instance_memory_request else \"\"\n", "memory_request_option = f' -mr \"{sql_instance_memory_request}Mi\"' if sql_instance_memory_request else \"\"\n",
"memory_limit_option = f' -ml \"{sql_instance_memory_limit}Mi\"' if sql_instance_memory_limit else \"\"\n", "memory_limit_option = f' -ml \"{sql_instance_memory_limit}Mi\"' if sql_instance_memory_limit else \"\"\n",
"\n", "\n",
"os.environ[\"AZDATA_PASSWORD\"] = mssql_password\n", "os.environ[\"AZDATA_PASSWORD\"] = mssql_password\n",
"cmd = f'azdata arc sql mi create -n {mssql_instance_name} -scd {mssql_storage_class_data} -scl {mssql_storage_class_logs}{port_option}{cores_request_option}{cores_limit_option}{memory_request_option}{memory_limit_option}'\n", "cmd = f'azdata arc sql mi create -n {mssql_instance_name} -scd {mssql_storage_class_data} -scl {mssql_storage_class_logs}{cores_request_option}{cores_limit_option}{memory_request_option}{memory_limit_option}'\n",
"out=run_command()" "out=run_command()"
], ],
"metadata": { "metadata": {

7
extensions/arc/package.json
View File

@@ -632,13 +632,6 @@
"required": true, "required": true,
"labelWidth": "100%" "labelWidth": "100%"
}, },
{
"label": "%arc.sql.instance.port%",
"variableName": "AZDATA_NB_VAR_SQL_INSTANCE_PORT",
"type": "number",
"required": false,
"labelWidth": "100%"
},
{ {
"label": "%arc.sql.username%", "label": "%arc.sql.username%",
"variableName": "AZDATA_NB_VAR_SQL_USERNAME", "variableName": "AZDATA_NB_VAR_SQL_USERNAME",

1
extensions/arc/package.nls.json
View File

@@ -83,7 +83,6 @@
"arc.sql.settings.section.title": "SQL Connection information", "arc.sql.settings.section.title": "SQL Connection information",
"arc.azure.section.title": "Azure information", "arc.azure.section.title": "Azure information",
"arc.sql.instance.name": "Instance name (lower case letters and digits only)", "arc.sql.instance.name": "Instance name (lower case letters and digits only)",
"arc.sql.instance.port": "Port",
"arc.sql.username": "Username", "arc.sql.username": "Username",
"arc.storage-class.dc.label": "Storage Class", "arc.storage-class.dc.label": "Storage Class",
"arc.sql.storage-class.dc.description": "The storage class to be used for all data and logs persistent volumes for all data controller pods that require them.", "arc.sql.storage-class.dc.description": "The storage class to be used for all data and logs persistent volumes for all data controller pods that require them.",