From 56e9feba1bb54a089d9dd042723a3f9fdea3d109 Mon Sep 17 00:00:00 2001 From: Charmaine Chan <69230572+charmainewkchan@users.noreply.github.com> Date: Wed, 22 Sep 2021 10:18:59 -0700 Subject: [PATCH] Apply optional storage class settings in sql mi create command (#17129) * Make storage classes optional * Fix notebook to use storage class options Co-authored-by: Charmaine Chan --- .../notebooks/arcDeployment/deploy.sql.existing.arc.ipynb | 5 ++++- extensions/arc/package.json | 4 ++-- extensions/arc/package.nls.json | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb b/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb index f90a9f4f9b..a1427f903b 100644 --- a/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb +++ b/extensions/arc/notebooks/arcDeployment/deploy.sql.existing.arc.ipynb @@ -120,9 +120,12 @@ "memory_request_option = f' --memory-request \"{sql_memory_request}Gi\"' if sql_memory_request else \"\"\n", "memory_limit_option = f' --memory-limit \"{sql_memory_limit}Gi\"' if sql_memory_limit else \"\"\n", "\n", + "storage_class_data_option = f' --storage-class-data \"{sql_storage_class_data}\"'if sql_storage_class_data else \"\"\n", + "storage_class_logs_option = f' --storage-class-logs \"{sql_storage_class_logs}\"'if sql_storage_class_logs else \"\"\n", + "\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} --use-k8s'\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_logs_option} --use-k8s'\n", "out=run_command()" ], "outputs": [], diff --git a/extensions/arc/package.json b/extensions/arc/package.json index 5141c614ea..2cb3b8faac 100644 --- a/extensions/arc/package.json +++ b/extensions/arc/package.json @@ -1001,14 +1001,14 @@ "description": "%arc.sql.storage-class.data.description%", "variableName": "AZDATA_NB_VAR_SQL_STORAGE_CLASS_DATA", "type": "kube_storage_class", - "required": true + "required": false }, { "label": "%arc.storage-class.logs.label%", "description": "%arc.sql.storage-class.logs.description%", "variableName": "AZDATA_NB_VAR_SQL_STORAGE_CLASS_LOGS", "type": "kube_storage_class", - "required": true + "required": false }, { "label": "%arc.cores-request.label%", diff --git a/extensions/arc/package.nls.json b/extensions/arc/package.nls.json index c102d5af14..0654ff4e8b 100644 --- a/extensions/arc/package.nls.json +++ b/extensions/arc/package.nls.json @@ -89,10 +89,10 @@ "arc.sql.replicas.label": "Replicas", "arc.sql.replicas.description": "The number of SQL Managed Instance replicas that will be deployed in your Kubernetes cluster for high availability purposes", "arc.storage-class.data.label": "Storage Class (Data)", - "arc.sql.storage-class.data.description": "The storage class to be used for data (.mdf)", + "arc.sql.storage-class.data.description": "The storage class to be used for data (.mdf). If no value is specified, the default storage class will be used.", "arc.postgres.storage-class.data.description": "The storage class to be used for data persistent volumes", "arc.storage-class.logs.label": "Storage Class (Logs)", - "arc.sql.storage-class.logs.description": "The storage class to be used for logs (/var/log)", + "arc.sql.storage-class.logs.description": "The storage class to be used for logs (/var/log). If no value is specified, the default storage class will be used.", "arc.postgres.storage-class.logs.description": "The storage class to be used for logs persistent volumes", "arc.storage-class.backups.label": "Storage Class (Backups)", "arc.cores-limit.label": "Cores Limit",