Skip to content

Commit

Permalink
arc ext changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@ranasaria
ranasaria committed Sep 25, 2020
1 parent f74e17e commit 602049b
Show file tree
Hide file tree
Showing 4 changed files with 100 additions and 7 deletions.
33 changes: 32 additions & 1 deletion extensions/arc/notebooks/arcDeployment/deploy.arc.data.controller.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
{
"cell_type": "markdown",
"source": [
"### **Setup and Check Prerequisites**"
"### **Setup**"
],
"metadata": {
"azdata_cell_guid": "e3dd8e75-e15f-44b4-81fc-1f54d6f0b1e2"
Expand Down Expand Up @@ -96,6 +96,37 @@
"azdata_cell_guid": "4b266b2d-bd1b-4565-92c9-3fc146cdce6d"
}
},
{
"cell_type": "markdown",
"source": [
"### **Set variable values from environment variables**"
],
"metadata": {
"azdata_cell_guid": "4a19f4d4-1fd5-4898-b38e-3a3901754de9"
}
},
{
"cell_type": "code",
"source": [
"arc_config_file = arc_config_file or os.environ[\"ADATA_NB_VAR_ARC_CONFIG_FILE\"]\n",
"arc_cluster_context = arc_cluster_context or os.environ[\"ADATA_NB_VAR_ARC_CLUSTER_CONTEXT\"]\n",
"arc_profile = arc_profile or os.environ[\"ADATA_NB_VAR_ARC_PROFILE\"]\n",
"arc_admin_username = arc_admin_username or os.environ[\"ADATA_NB_VAR_ARC_ADMIN_USERNAME\"]\n",
"arc_subscription = arc_subscription or os.environ[\"ADATA_NB_VAR_ARC_SUBSCRIPTION\"]\n",
"arc_display_subscription = arc_display_subscription or os.environ[\"ADATA_NB_VAR_ARC_DISPLAY_SUBSCRIPTION\"]\n",
"arc_resource_group = arc_resource_group or os.environ[\"ADATA_NB_VAR_ARC_RESOURCE_GROUP\"]\n",
"arc_data_controller_namespace = arc_data_controller_namespace or os.environ[\"ADATA_NB_VAR_ARC_DATA_CONTROLLER_NAMESPACE\"]\n",
"arc_data_controller_name = arc_data_controller_name or os.environ[\"ADATA_NB_VAR_ARC_DATA_CONTROLLER_NAME\"]\n",
"arc_data_controller_storage_class = arc_data_controller_storage_class or os.environ[\"ADATA_NB_VAR_ARC_DATA_CONTROLLER_STORAGE_CLASS\"]\n",
"arc_data_controller_location = arc_data_controller_location or os.environ[\"ADATA_NB_VAR_ARC_DATA_CONTROLLER_LOCATION\"]\n",
"arc_data_controller_display_location = arc_data_controller_display_location or os.environ[\"ADATA_NB_VAR_ARC_DATA_CONTROLLER_DISPLAY_LOCATION\"]"
],
"metadata": {
"azdata_cell_guid": "e2cee548-0dcc-41e9-9807-ca8aaeb0ae1f"
},
"outputs": [],
"execution_count": null
},
{
"cell_type": "markdown",
"source": [
Expand Down
36 changes: 36 additions & 0 deletions extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,42 @@
"azdata_cell_guid": "68ec0760-27d1-4ded-9a9f-89077c40b8bb"
}
},
{
"cell_type": "markdown",
"source": [
"### **Set variable values from environment variables**"
],
"metadata": {
"azdata_cell_guid": "36a1948a-4835-43e2-8d93-afbceca9222f"
}
},
{
"cell_type": "code",
"source": [
"postgres_server_group_cores_request = postgres_server_group_cores_request or os.environ[\"ADATA_NB_VAR_POSTGRES_SERVER_GROUP_CORES_REQUEST\"]\n",
"postgres_server_group_cores_limit = postgres_server_group_cores_limit or os.environ[\"ADATA_NB_VAR_POSTGRES_SERVER_GROUP_CORES_LIMIT\"]\n",
"postgres_server_group_memory_request = postgres_server_group_memory_request or os.environ[\"ADATA_NB_VAR_POSTGRES_SERVER_GROUP_MEMORY_REQUEST\"]\n",
"postgres_server_group_memory_limit = postgres_server_group_memory_limit or os.environ[\"ADATA_NB_VAR_POSTGRES_SERVER_GROUP_MEMORY_LIMIT\"]\n",
"postgres_server_group_name = postgres_server_group_name or os.environ[\"ADATA_NB_VAR_POSTGRES_SERVER_GROUP_NAME\"]\n",
"postgres_server_group_workers = postgres_server_group_workers or os.environ[\"ADATA_NB_VAR_POSTGRES_SERVER_GROUP_WORKERS\"]\n",
"postgres_server_group_port = postgres_server_group_port or os.environ[\"ADATA_NB_VAR_POSTGRES_SERVER_GROUP_PORT\"]\n",
"postgres_server_group_engine_version = postgres_server_group_engine_version or os.environ[\"ADATA_NB_VAR_POSTGRES_SERVER_GROUP_ENGINE_VERSION\"]\n",
"postgres_server_group_extensions = postgres_server_group_extensions or os.environ[\"ADATA_NB_VAR_POSTGRES_SERVER_GROUP_EXTENSIONS\"]\n",
"postgres_storage_class_data = postgres_storage_class_data or os.environ[\"ADATA_NB_VAR_POSTGRES_STORAGE_CLASS_DATA\"]\n",
"postgres_server_group_volume_size_data = postgres_server_group_volume_size_data or os.environ[\"ADATA_NB_VAR_POSTGRES_SERVER_GROUP_VOLUME_SIZE_DATA\"]\n",
"postgres_storage_class_logs = postgres_storage_class_logs or os.environ[\"ADATA_NB_VAR_POSTGRES_STORAGE_CLASS_LOGS\"]\n",
"postgres_server_group_volume_size_logs = postgres_server_group_volume_size_logs or os.environ[\"ADATA_NB_VAR_POSTGRES_SERVER_GROUP_VOLUME_SIZE_LOGS\"]\n",
"postgres_storage_class_backups = postgres_storage_class_backups or os.environ[\"ADATA_NB_VAR_POSTGRES_STORAGE_CLASS_BACKUPS\"]\n",
"postgres_server_group_volume_size_backups = postgres_server_group_volume_size_backups or os.environ[\"ADATA_NB_VAR_POSTGRES_SERVER_GROUP_VOLUME_SIZE_BACKUPS\"]\n",
"controller_endpoint = controller_endpoint or os.environ[\"ADATA_NB_VAR_CONTROLLER_ENDPOINT\"]\n",
"controller_username = controller_username or os.environ[\"ADATA_NB_VAR_CONTROLLER_USERNAME\"]"
],
"metadata": {
"azdata_cell_guid": "ed798542-c292-4b9e-9abc-d9bf8abf4143"
},
"outputs": [],
"execution_count": null
},
{
"cell_type": "markdown",
"source": [
Expand Down
29 changes: 29 additions & 0 deletions extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,35 @@
"azdata_cell_guid": "68ec0760-27d1-4ded-9a9f-89077c40b8bb"
}
},
{
"cell_type": "markdown",
"source": [
"### **Set variable values from environment variables**"
],
"metadata": {
"azdata_cell_guid": "c48a794b-8c31-48b7-904f-31aead666eae"
}
},
{
"cell_type": "code",
"source": [
"sql_instance_name = sql_instance_name or os.environ[\"ADATA_NB_VAR_SQL_INSTANCE_NAME\"]\n",
"sql_username = sql_username or os.environ[\"ADATA_NB_VAR_SQL_USERNAME\"]\n",
"sql_storage_class_data = sql_storage_class_data or os.environ[\"ADATA_NB_VAR_SQL_STORAGE_CLASS_DATA\"]\n",
"sql_storage_class_logs = sql_storage_class_logs or os.environ[\"ADATA_NB_VAR_SQL_STORAGE_CLASS_LOGS\"]\n",
"sql_cores_request = sql_cores_request or os.environ[\"ADATA_NB_VAR_SQL_CORES_REQUEST\"]\n",
"sql_cores_limit = sql_cores_limit or os.environ[\"ADATA_NB_VAR_SQL_CORES_LIMIT\"]\n",
"sql_memory_request = sql_memory_request or os.environ[\"ADATA_NB_VAR_SQL_MEMORY_REQUEST\"]\n",
"sql_memory_limit = sql_memory_limit or os.environ[\"ADATA_NB_VAR_SQL_MEMORY_LIMIT\"]\n",
"controller_endpoint = controller_endpoint or os.environ[\"ADATA_NB_VAR_CONTROLLER_ENDPOINT\"]\n",
"controller_username = controller_username or os.environ[\"ADATA_NB_VAR_CONTROLLER_USERNAME\"]"
],
"metadata": {
"azdata_cell_guid": "69a96851-6b70-494f-8eb5-984652e88005"
},
"outputs": [],
"execution_count": null
},
{
"cell_type": "markdown",
"source": [
Expand Down
9 changes: 3 additions & 6 deletions extensions/arc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,8 @@
"notebookWizard": {
"notebook": "./notebooks/arcDeployment/deploy.arc.data.controller.ipynb",
"type": "new-arc-control-plane",
"runNotebook": false,
"runNotebook": "userChooses",
"codeCellInsertionPosition": 5,
"actionText": "%deploy.script.to.notebook.action%",
"title": "%arc.data.controller.new.wizard.title%",
"name": "arc.data.controller.new.wizard",
"labelPosition": "left",
Expand Down Expand Up @@ -521,9 +520,8 @@
{
"notebookWizard": {
"notebook": "./notebooks/arcDeployment/deploy.sql.existing.arc.ipynb",
"runNotebook": false,
"runNotebook": "userChooses",
"codeCellInsertionPosition": 5,
"actionText": "%deploy.script.to.notebook.action%",
"title": "%arc.sql.wizard.title%",
"name": "arc.sql.wizard",
"labelPosition": "left",
Expand Down Expand Up @@ -682,9 +680,8 @@
{
"notebookWizard": {
"notebook": "./notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb",
"runNotebook": false,
"runNotebook": "userChooses",
"codeCellInsertionPosition": 5,
"actionText": "%deploy.script.to.notebook.action%",
"title": "%arc.postgres.wizard.title%",
"name": "arc.postgres.wizard",
"labelPosition": "left",
Expand Down

0 comments on commit 602049b

Please sign in to comment.