DC Create Bug Fix: Cluster Name (#19859)

* Changed namespace to have empty default value. Added cluster name as a field for direct mode. Updated summary page and notebook as necessary.

* Made storage class = default if storage class is undefined

* Moved cluster name before custom location

Co-authored-by: Candice Ye <canye@microsoft.com>

extensions/arc/notebooks/arcDeployment/deploy.arc.data.controller.ipynb

@@ -188,13 +188,15 @@
                 "os.environ[\"LOG_WORKSPACE_ID\"] = log_analytics_workspace_id\n",
                 "os.environ[\"LOG_SHARED_KEY\"] = log_analytics_primary_key\n",
                 "\n",
+                "storage_class = arc_data_controller_storage_class if arc_data_controller_storage_class else 'default'\n",
+                "\n",
                 "# If connection mode is indirect\n",
                 "namespace = f' --k8s-namespace {arc_data_controller_namespace}' if is_indirect else ''\n",
                 "use_k8s = ' --use-k8s' if is_indirect else ''\n",
                 "\n",
                 "# If connection mode is direct\n",
                 "custom_location = f' --custom-location {arc_data_controller_custom_location}' if not is_indirect else ''\n",
-                "cluster_name = f' --cluster-name {arc_cluster_context}' if not is_indirect else ''\n",
+                "cluster_name = f' --cluster-name {arc_data_controller_cluster_name}' if not is_indirect else ''\n",
                 "auto_upload_metrics_value = 'true' if arc_data_controller_auto_upload_metrics == 'true' else 'false'\n",
                 "auto_upload_logs_value = 'true' if arc_data_controller_auto_upload_logs == 'true' else 'false'\n",
                 "auto_upload_metrics = f' --auto-upload-metrics {auto_upload_metrics_value}' if not is_indirect else ''\n",
@@ -202,7 +204,7 @@
                 "\n",
                 "if os.name == 'nt':\n",
                 "    print(f'If you don\\'t see output produced by az, you can run the following command in a terminal window to check the deployment status:\\n\\t {os.environ[\"AZDATA_NB_VAR_KUBECTL\"]} get pods -n {arc_data_controller_namespace}')\n",
-                "run_command(f'az arcdata dc create --connectivity-mode {arc_data_controller_connectivity_mode} --name {arc_data_controller_name}{namespace} --subscription {arc_subscription} --resource-group {arc_resource_group} --location {arc_data_controller_location} --storage-class {arc_data_controller_storage_class} --profile-name {arc_profile} --infrastructure {arc_infrastructure}{custom_location}{cluster_name}{auto_upload_metrics}{auto_upload_logs}{use_k8s}')\n",
+                "run_command(f'az arcdata dc create --connectivity-mode {arc_data_controller_connectivity_mode} --name {arc_data_controller_name}{namespace} --subscription {arc_subscription} --resource-group {arc_resource_group} --location {arc_data_controller_location} --storage-class {storage_class} --profile-name {arc_profile} --infrastructure {arc_infrastructure}{custom_location}{cluster_name}{auto_upload_metrics}{auto_upload_logs}{use_k8s}')\n",
                 "print(f'Azure Arc Data Controller: {arc_data_controller_name} created.') "
             ]
         },

extensions/arc/package.json

@@ -284,13 +284,14 @@
                               "description": "%arc.data.controller.namespace.validation.description%"
                             }
                           ],
-                          "defaultValue": "arc",
+                          "defaultValue": "",
                           "required": true,
                           "variableName": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_NAMESPACE",
                           "enabled": {
                             "target": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_CONNECTIVITY_MODE",
                             "value": "Indirect"
-                          }
+                          },
+                          "description": "%arc.data.controller.namespace.description%"
                         },
                         {
                           "type": "text",
@@ -328,6 +329,17 @@
                             "other"
                           ]
                         },
+                        {
+                          "type": "text",
+                          "label": "%arc.data.controller.cluster.name%",
+                          "description": "%arc.data.controller.cluster.name.description%",
+                          "required": true,
+                          "variableName": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_CLUSTER_NAME",
+                          "enabled": {
+                            "target": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_CONNECTIVITY_MODE",
+                            "value": "Direct"
+                          }
+                        },
                         {
                           "type": "text",
                           "label": "%arc.data.controller.custom.location%",
@@ -571,6 +583,12 @@
                           "isEvaluated": true,
                           "defaultValue": "$(AZDATA_NB_VAR_ARC_CLUSTER_CONTEXT)"
                         },
+                        {
+                          "label": "%arc.data.controller.summary.cluster.name%",
+                          "type": "readonly_text",
+                          "isEvaluated": true,
+                          "defaultValue": "$(AZDATA_NB_VAR_ARC_DATA_CONTROLLER_CLUSTER_NAME)"
+                        },
                         {
                           "label": "%arc.data.controller.summary.profile%",
                           "type": "readonly_text",
@@ -618,6 +636,12 @@
                           "isEvaluated": true,
                           "defaultValue": "$(AZDATA_NB_VAR_ARC_DATA_CONTROLLER_NAMESPACE)"
                         },
+                        {
+                          "label": "%arc.data.controller.summary.data.controller.custom.location%",
+                          "type": "readonly_text",
+                          "isEvaluated": true,
+                          "defaultValue": "$(AZDATA_NB_VAR_ARC_DATA_CONTROLLER_CUSTOM_LOCATION)"
+                        },
                         {
                           "label": "%arc.data.controller.summary.data.controller.name%",
                           "type": "readonly_text",

extensions/arc/package.nls.json

@@ -31,7 +31,7 @@
 	"arc.data.controller.details.description": "For indirect mode, provide a namespace, name and storage class for your Azure Arc data controller. This name will be used to identify your Arc instance for remote management and monitoring. For direct mode you do not need to provide a namespace, but please provide the custom location name.",
 	"arc.data.controller.connectivity.mode": "Connectivity mode",
 	"arc.data.controller.namespace": "Data controller namespace",
-	"arc.data.controller.namespace.description": "Indirect mode only.",
+	"arc.data.controller.namespace.description": "Data controller namespace. Indirect mode only.",
 	"arc.data.controller.namespace.validation.description": "Namespace must consist of lower case alphanumeric characters or '-', start/end with an alphanumeric character, and be 63 characters or fewer in length.",
 	"arc.data.controller.name": "Data controller name",
 	"arc.data.controller.name.validation.description": "Name must consist of lower case alphanumeric characters, '-' or '.', start/end with an alphanumeric character and be 253 characters or less in length.",
@@ -39,6 +39,8 @@
 	"arc.data.controller.infrastructure": "Infrastructure",
 	"arc.data.controller.custom.location": "Custom Location",
 	"arc.data.controller.custom.location.description": "The name of the custom location. Direct mode only.",
+	"arc.data.controller.cluster.name": "Cluster Name",
+	"arc.data.controller.cluster.name.description": "The name of the cluster. Direct mode only.",
 	"arc.data.controller.auto.upload.metrics": "Auto-upload Metrics",
 	"arc.data.controller.auto.upload.metrics.description": "Enable the automatic upload of metrics. Direct mode only.",
 	"arc.data.controller.auto.upload.logs": "Auto-upload Logs",
@@ -67,6 +69,7 @@
 	"arc.data.controller.summary.kubernetes": "Kubernetes",
 	"arc.data.controller.summary.kube.config.file.path": "Kube config file path",
 	"arc.data.controller.summary.cluster.context": "Cluster context",
+	"arc.data.controller.summary.cluster.name": "Cluster name",
 	"arc.data.controller.summary.profile": "Config profile",
 	"arc.data.controller.summary.username": "Username",
 	"arc.data.controller.summary.azure": "Azure",
@@ -74,6 +77,7 @@
 	"arc.data.controller.summary.resource.group": "Resource group",
 	"arc.data.controller.summary.data.controller.name": "Data controller name",
 	"arc.data.controller.summary.data.controller.namespace": "Data controller namespace",
+	"arc.data.controller.summary.data.controller.custom.location": "Data controller custom location",
 	"arc.data.controller.summary.data.controller.infrastructure": "Data controller infrastructure",
 	"arc.data.controller.summary.controller": "Controller",
 	"arc.data.controller.summary.location": "Location",