From 63828dcc155317f09f0744f548b7f27a71ce5650 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Fri, 12 Mar 2021 14:26:57 -0800 Subject: [PATCH] Remove connectivity mode from Arc deployment (#14710) --- .../deploy.arc.data.controller.ipynb | 10 +- extensions/arc/package.json | 99 ------------------- extensions/arc/package.nls.json | 15 +-- 3 files changed, 3 insertions(+), 121 deletions(-) diff --git a/extensions/arc/notebooks/arcDeployment/deploy.arc.data.controller.ipynb b/extensions/arc/notebooks/arcDeployment/deploy.arc.data.controller.ipynb index 8b1a11a260..1ec42152d3 100644 --- a/extensions/arc/notebooks/arcDeployment/deploy.arc.data.controller.ipynb +++ b/extensions/arc/notebooks/arcDeployment/deploy.arc.data.controller.ipynb @@ -132,13 +132,7 @@ " sys.exit(f'Password is required.')\n", " confirm_password = getpass.getpass(prompt = 'Confirm password')\n", " if arc_admin_password != confirm_password:\n", - " sys.exit(f'Passwords do not match.')\n", - "\n", - "os.environ[\"SPN_CLIENT_ID\"] = sp_client_id\n", - "os.environ[\"SPN_TENANT_ID\"] = sp_tenant_id\n", - "if \"AZDATA_NB_VAR_SP_CLIENT_SECRET\" in os.environ:\n", - " os.environ[\"SPN_CLIENT_SECRET\"] = os.environ[\"AZDATA_NB_VAR_SP_CLIENT_SECRET\"]\n", - "os.environ[\"SPN_AUTHORITY\"] = \"https://login.microsoftonline.com\"" + " sys.exit(f'Passwords do not match.')" ], "metadata": { "azdata_cell_guid": "e7e10828-6cae-45af-8c2f-1484b6d4f9ac", @@ -188,7 +182,7 @@ "os.environ[\"AZDATA_PASSWORD\"] = arc_admin_password\n", "if os.name == 'nt':\n", " print(f'If you don\\'t see output produced by azdata, 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'azdata arc dc create --connectivity-mode {arc_data_controller_connectivity_mode} -n {arc_data_controller_name} -ns {arc_data_controller_namespace} -s {arc_subscription} -g {arc_resource_group} -l {arc_data_controller_location} -sc {arc_data_controller_storage_class} --profile-name {arc_profile}')\n", + "run_command(f'azdata arc dc create --connectivity-mode Indirect -n {arc_data_controller_name} -ns {arc_data_controller_namespace} -s {arc_subscription} -g {arc_resource_group} -l {arc_data_controller_location} -sc {arc_data_controller_storage_class} --profile-name {arc_profile}')\n", "print(f'Azure Arc Data Controller: {arc_data_controller_name} created.') " ], "metadata": { diff --git a/extensions/arc/package.json b/extensions/arc/package.json index 4413b82d0c..5b30a487e6 100644 --- a/extensions/arc/package.json +++ b/extensions/arc/package.json @@ -241,99 +241,6 @@ ] } ] - }, - { - "title": "%arc.data.controller.connectivitymode%", - "fields": [ - { - "type": "readonly_text", - "label": "%arc.data.controller.connectivitymode.description%", - "labelWidth": "600px" - }, - { - "type": "options", - "label": "%arc.data.controller.connectivitymode%", - "required": true, - "variableName": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_CONNECTIVITY_MODE", - "options": { - "values": [ - { - "name": "indirect", - "displayName": "%arc.data.controller.indirect%" - }, - { - "name": "direct", - "displayName": "%arc.data.controller.direct%" - } - ], - "defaultValue": "%arc.data.controller.indirect%", - "optionsType": "radio" - } - }, - { - "type": "readonly_text", - "label": "%arc.data.controller.serviceprincipal.description%", - "labelWidth": "600px", - "links": [ - { - "text": "%arc.data.controller.readmore%", - "url": "https://docs.microsoft.com/azure/azure-arc/data/upload-metrics" - } - ] - }, - { - "label": "%arc.data.controller.spclientid%", - "description": "%arc.data.controller.spclientid.description%", - "variableName": "AZDATA_NB_VAR_SP_CLIENT_ID", - "type": "text", - "required": true, - "defaultValue": "", - "placeHolder": "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", - "enabled": { - "target": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_CONNECTIVITY_MODE", - "value": "direct" - }, - "validations": [ - { - "type": "regex_match", - "regex": "^[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}$", - "description": "%arc.data.controller.spclientid.validation.description%" - } - ] - }, - { - "label": "%arc.data.controller.spclientsecret%", - "description": "%arc.data.controller.spclientsecret.description%", - "variableName": "AZDATA_NB_VAR_SP_CLIENT_SECRET", - "type": "password", - "required": true, - "defaultValue": "", - "enabled": { - "target": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_CONNECTIVITY_MODE", - "value": "direct" - } - }, - { - "label": "%arc.data.controller.sptenantid%", - "description": "%arc.data.controller.sptenantid.description%", - "variableName": "AZDATA_NB_VAR_SP_TENANT_ID", - "type": "text", - "required": true, - "defaultValue": "", - "enabled": false, - "valueProvider": { - "providerId": "subscription-id-to-tenant-id", - "triggerField": "AZDATA_NB_VAR_ARC_SUBSCRIPTION" - }, - "validations": [ - { - "type": "regex_match", - "regex": "^[0-9A-Fa-f]{8}-([0-9A-Fa-f]{4}-){3}[0-9A-Fa-f]{12}$", - "description": "%arc.data.controller.sptenantid.validation.description%" - } - ] - } - ] } ] }, @@ -600,12 +507,6 @@ "type": "readonly_text", "isEvaluated": true, "defaultValue": "$(AZDATA_NB_VAR_ARC_DATA_CONTROLLER_NAME)" - }, - { - "label": "%arc.data.controller.connectivitymode%", - "type": "readonly_text", - "isEvaluated": true, - "defaultValue": "$(AZDATA_NB_VAR_ARC_DATA_CONTROLLER_CONNECTIVITY_MODE)" } ] } diff --git a/extensions/arc/package.nls.json b/extensions/arc/package.nls.json index f39facdb66..fa7c97ce44 100644 --- a/extensions/arc/package.nls.json +++ b/extensions/arc/package.nls.json @@ -22,8 +22,7 @@ "arc.data.controller.cluster.config.profile": "Config profile", "arc.data.controller.cluster.config.profile.loading": "Loading config profiles", "arc.data.controller.cluster.config.profile.loadingcompleted": "Loading config profiles complete", - "arc.data.controller.create.azureconfig.title": "Azure and Connectivity Configuration", - "arc.data.controller.connectivitymode.description": "Select the connectivity mode for the controller.", + "arc.data.controller.create.azureconfig.title": "Azure Configuration", "arc.data.controller.create.controllerconfig.title": "Controller Configuration", "arc.data.controller.project.details.title": "Azure details", "arc.data.controller.project.details.description": "Select the subscription to manage deployed resources and costs. Use resource groups like folders to organize and manage all your resources.", @@ -38,18 +37,6 @@ "arc.data.controller.admin.account.name": "Data controller login", "arc.data.controller.admin.account.password": "Password", "arc.data.controller.admin.account.confirm.password": "Confirm password", - "arc.data.controller.connectivitymode": "Connectivity Mode", - "arc.data.controller.direct": "Direct", - "arc.data.controller.indirect": "Indirect", - "arc.data.controller.serviceprincipal.description": "When deploying a controller in direct connected mode a Service Principal is required for connecting to Azure. {0} about how to create this Service Principal and assign it the correct roles.", - "arc.data.controller.spclientid": "Service Principal Client ID", - "arc.data.controller.spclientid.description": "The Client (application) ID of the created Service Principal", - "arc.data.controller.spclientid.validation.description": "The Client ID must be a GUID in the format xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", - "arc.data.controller.spclientsecret": "Service Principal Client Secret", - "arc.data.controller.spclientsecret.description": "The secret (password) of the Service Principal", - "arc.data.controller.sptenantid": "Service Principal Tenant ID", - "arc.data.controller.sptenantid.description": "The Tenant ID of the Service Principal. This must be the same as the Tenant ID of the subscription selected to create this controller for.", - "arc.data.controller.sptenantid.validation.description": "The tenant ID must be a GUID in the format xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx", "arc.data.controller.create.summary.title": "Review your configuration", "arc.data.controller.summary.arc.data.controller": "Azure Arc data controller", "arc.data.controller.summary.estimated.cost.per.month": "Estimated cost per month",