Arc updates for March release (#14970)

* Updated Postgres Spec for where to find engine version, removed calling calling -ev in edit commands (#14735) * Added spec.engine.version, took out calling engine version with edit calls * Added text wrong place * missed updates * PR fix * Update Arc Postgres troubleshooting notebook Co-authored-by: Brian Bergeron <brberger@microsoft.com> * Remove AzdataSession from azdata commands (#14856) * remove session * Add in controller-context support * Revert "Add in controller-context support" This reverts commit 3b39b968efbf6054041cb01cb2d8443532643a82. * Add azdataContext to login * Undo book change * Undo change correctly * Add controller context support (#14862) * remove session * Add in controller-context support * Add params to fake * Fix tests * Add info and placeholder for controller URL/name (#14887) * Add info and placeholder for controller URL * add period + update name * update memento and allow editing of namespace/URL * vBump * vBump * Fix tests Co-authored-by: nasc17 <69922333+nasc17@users.noreply.github.com> Co-authored-by: Brian Bergeron <brian.e.bergeron@gmail.com> Co-authored-by: Brian Bergeron <brberger@microsoft.com>
2026-02-03 09:35:40 -05:00 · 2021-04-05 11:47:36 -07:00
parent 71b91c3890
commit febd8b29c9
44 changed files with 525 additions and 740 deletions
--- a/extensions/arc/src/ui/components/radioOptionsGroup.ts
+++ b/extensions/arc/src/ui/components/radioOptionsGroup.ts
@@ -17,6 +17,9 @@ export class RadioOptionsGroup {
 	private _loadingBuilder: azdata.LoadingComponentBuilder;
 	private _currentRadioOption!: azdata.RadioButtonComponent;

+	private _onRadioOptionChanged: vscode.EventEmitter<string | undefined> = new vscode.EventEmitter<string | undefined>();
+	public onRadioOptionChanged: vscode.Event<string | undefined> = this._onRadioOptionChanged.event;
+
 	constructor(private _modelBuilder: azdata.ModelBuilder, private _onNewDisposableCreated: (disposable: vscode.Disposable) => void, private _groupName: string = `RadioOptionsGroup${RadioOptionsGroup.id++}`) {
 		this._divContainer = this._modelBuilder.divContainer().withProperties<azdata.DivContainerProperties>({ clickable: false }).component();
 		this._loadingBuilder = this._modelBuilder.loadingComponent().withItem(this._divContainer);
@@ -26,7 +29,7 @@ export class RadioOptionsGroup {
 		return this._loadingBuilder.component();
 	}

-	async load(optionsInfoGetter: () => Promise<RadioOptionsInfo>): Promise<void> {
+	async load(optionsInfoGetter: () => RadioOptionsInfo | Promise<RadioOptionsInfo>): Promise<void> {
 		this.component().loading = true;
 		this._divContainer.clearItems();
 		try {
@@ -51,6 +54,7 @@ export class RadioOptionsGroup {
 						// it is just better to keep things clean.
 						this._currentRadioOption.checked = false;
 						this._currentRadioOption = radioOption;
+						this._onRadioOptionChanged.fire(this.value);
 					}
 				}));
 				this._divContainer.addItem(radioOption);
--- a/extensions/arc/src/ui/dashboards/miaa/miaaComputeAndStoragePage.ts
+++ b/extensions/arc/src/ui/dashboards/miaa/miaaComputeAndStoragePage.ts
@@ -129,16 +129,12 @@ export class MiaaComputeAndStoragePage extends DashboardPage {
 							cancellable: false
 						},
 						async (_progress, _token): Promise<void> => {
-							let session: azdataExt.AzdataSession | undefined = undefined;
 							try {
-								session = await this._miaaModel.controllerModel.acquireAzdataSession();
 								await this._azdataApi.azdata.arc.sql.mi.edit(
-									this._miaaModel.info.name, this.saveArgs, this._miaaModel.controllerModel.azdataAdditionalEnvVars, session);
+									this._miaaModel.info.name, this.saveArgs, this._miaaModel.controllerModel.azdataAdditionalEnvVars, this._miaaModel.controllerModel.controllerContext);
 							} catch (err) {
 								this.saveButton!.enabled = true;
 								throw err;
-							} finally {
-								session?.dispose();
 							}
 							try {
 								await this._miaaModel.refresh();
--- a/extensions/arc/src/ui/dashboards/miaa/miaaDashboardOverviewPage.ts
+++ b/extensions/arc/src/ui/dashboards/miaa/miaaDashboardOverviewPage.ts
@@ -244,12 +244,7 @@ export class MiaaDashboardOverviewPage extends DashboardPage {
 								cancellable: false
 							},
 							async (_progress, _token) => {
-								const session = await this._controllerModel.acquireAzdataSession();
-								try {
-									return await this._azdataApi.azdata.arc.sql.mi.delete(this._miaaModel.info.name, this._controllerModel.azdataAdditionalEnvVars, session);
-								} finally {
-									session.dispose();
-								}
+								return await this._azdataApi.azdata.arc.sql.mi.delete(this._miaaModel.info.name, this._controllerModel.azdataAdditionalEnvVars, this._controllerModel.controllerContext);
 							}
 						);
 						await this._controllerModel.refreshTreeNode();
--- a/extensions/arc/src/ui/dashboards/postgres/postgresComputeAndStoragePage.ts
+++ b/extensions/arc/src/ui/dashboards/postgres/postgresComputeAndStoragePage.ts
@@ -179,9 +179,7 @@ export class PostgresComputeAndStoragePage extends DashboardPage {
 							cancellable: false
 						},
 						async (_progress, _token): Promise<void> => {
-							let session: azdataExt.AzdataSession | undefined = undefined;
 							try {
-								session = await this._postgresModel.controllerModel.acquireAzdataSession();
 								await this._azdataApi.azdata.arc.postgres.server.edit(
 									this._postgresModel.info.name,
 									{
@@ -191,10 +189,7 @@ export class PostgresComputeAndStoragePage extends DashboardPage {
 										memoryRequest: this.saveArgs.workerMemoryRequest,
 										memoryLimit: this.saveArgs.workerMemoryLimit
 									},
-									this._postgresModel.engineVersion,
-									this._postgresModel.controllerModel.azdataAdditionalEnvVars,
-									session
-								);
+									this._postgresModel.controllerModel.azdataAdditionalEnvVars);
 								/* TODO add second edit call for coordinator configuration
 									await this._azdataApi.azdata.arc.postgres.server.edit(
 										this._postgresModel.info.name,
@@ -204,7 +199,6 @@ export class PostgresComputeAndStoragePage extends DashboardPage {
 										memoryRequest: this.saveArgs.coordinatorMemoryRequest,
 										memoryLimit: this.saveArgs.coordinatorMemoryLimit
 										},
-										this._postgresModel.engineVersion,
 										this._postgresModel.controllerModel.azdataAdditionalEnvVars,
 										session
 									);
@@ -214,8 +208,6 @@ export class PostgresComputeAndStoragePage extends DashboardPage {
 								// the edit wasn't successfully applied
 								this.saveButton.enabled = true;
 								throw err;
-							} finally {
-								session?.dispose();
 							}
 							try {
 								await this._postgresModel.refresh();
--- a/extensions/arc/src/ui/dashboards/postgres/postgresCoordinatorNodeParametersPage.ts
+++ b/extensions/arc/src/ui/dashboards/postgres/postgresCoordinatorNodeParametersPage.ts
@@ -39,8 +39,7 @@ export class PostgresCoordinatorNodeParametersPage extends PostgresParametersPag
 		/* TODO add correct azdata call for editing coordinator parameters
 			await this._azdataApi.azdata.arc.postgres.server.edit(
 				this._postgresModel.info.name,
-				{ engineSettings: engineSettings },
-				this._postgresModel.engineVersion,
+				{ engineSettings: engineSettings.toString() },
 				this._postgresModel.controllerModel.azdataAdditionalEnvVars,
 				session);
 		*/
@@ -51,7 +50,6 @@ export class PostgresCoordinatorNodeParametersPage extends PostgresParametersPag
 			await this._azdataApi.azdata.arc.postgres.server.edit(
 				this._postgresModel.info.name,
 				{ engineSettings: `''`, replaceEngineSettings: true },
-				this._postgresModel.engineVersion,
 				this._postgresModel.controllerModel.azdataAdditionalEnvVars,
 				session);
 		*/
@@ -62,7 +60,6 @@ export class PostgresCoordinatorNodeParametersPage extends PostgresParametersPag
 			await this._azdataApi.azdata.arc.postgres.server.edit(
 				this._postgresModel.info.name,
 				{ engineSettings: parameterName + '=' },
-				this._postgresModel.engineVersion,
 				this._postgresModel.controllerModel.azdataAdditionalEnvVars,
 				session);
 		*/
--- a/extensions/arc/src/ui/dashboards/postgres/postgresDashboard.ts
+++ b/extensions/arc/src/ui/dashboards/postgres/postgresDashboard.ts
@@ -39,7 +39,7 @@ export class PostgresDashboard extends Dashboard {
 		// TODO Add dashboard once backend is able to be connected for per role server parameter edits.
 		// const coordinatorNodeParametersPage = new PostgresCoordinatorNodeParametersPage(modelView, this._postgresModel);
 		const workerNodeParametersPage = new PostgresWorkerNodeParametersPage(modelView, this.dashboard, this._postgresModel);
-		const diagnoseAndSolveProblemsPage = new PostgresDiagnoseAndSolveProblemsPage(modelView, this.dashboard, this._context, this._postgresModel);
+		const diagnoseAndSolveProblemsPage = new PostgresDiagnoseAndSolveProblemsPage(modelView, this.dashboard, this._context, this._controllerModel, this._postgresModel);
 		const supportRequestPage = new PostgresSupportRequestPage(modelView, this.dashboard, this._controllerModel, this._postgresModel);
 		const resourceHealthPage = new PostgresResourceHealthPage(modelView, this.dashboard, this._postgresModel);

--- a/extensions/arc/src/ui/dashboards/postgres/postgresDiagnoseAndSolveProblemsPage.ts
+++ b/extensions/arc/src/ui/dashboards/postgres/postgresDiagnoseAndSolveProblemsPage.ts
@@ -9,9 +9,10 @@ import * as loc from '../../../localizedConstants';
 import { IconPathHelper, cssStyles } from '../../../constants';
 import { DashboardPage } from '../../components/dashboardPage';
 import { PostgresModel } from '../../../models/postgresModel';
+import { ControllerModel } from '../../../models/controllerModel';

 export class PostgresDiagnoseAndSolveProblemsPage extends DashboardPage {
-	constructor(protected modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _context: vscode.ExtensionContext, private _postgresModel: PostgresModel) {
+	constructor(modelView: azdata.ModelView, dashboard: azdata.window.ModelViewDashboard, private _context: vscode.ExtensionContext, private _controllerModel: ControllerModel, private _postgresModel: PostgresModel) {
 		super(modelView, dashboard);
 	}

@@ -50,9 +51,8 @@ export class PostgresDiagnoseAndSolveProblemsPage extends DashboardPage {

 		this.disposables.push(
 			troubleshootButton.onDidClick(() => {
-				process.env['POSTGRES_SERVER_NAMESPACE'] = this._postgresModel.config?.metadata.namespace;
+				process.env['POSTGRES_SERVER_NAMESPACE'] = this._controllerModel.controllerConfig?.metadata.namespace ?? '';
 				process.env['POSTGRES_SERVER_NAME'] = this._postgresModel.info.name;
-				process.env['POSTGRES_SERVER_VERSION'] = this._postgresModel.engineVersion;
 				vscode.commands.executeCommand('bookTreeView.openBook', this._context.asAbsolutePath('notebooks/arcDataServices'), true, 'postgres/tsg100-troubleshoot-postgres');
 			}));

--- a/extensions/arc/src/ui/dashboards/postgres/postgresOverviewPage.ts
+++ b/extensions/arc/src/ui/dashboards/postgres/postgresOverviewPage.ts
@@ -217,21 +217,13 @@ export class PostgresOverviewPage extends DashboardPage {
 				try {
 					const password = await promptAndConfirmPassword(input => !input ? loc.enterANonEmptyPassword : '');
 					if (password) {
-						const session = await this._postgresModel.controllerModel.acquireAzdataSession();
-						try {
-							await this._azdataApi.azdata.arc.postgres.server.edit(
-								this._postgresModel.info.name,
-								{
-									adminPassword: true,
-									noWait: true
-								},
-								this._postgresModel.engineVersion,
-								Object.assign({ 'AZDATA_PASSWORD': password }, this._controllerModel.azdataAdditionalEnvVars),
-								session
-							);
-						} finally {
-							session.dispose();
-						}
+						await this._azdataApi.azdata.arc.postgres.server.edit(
+							this._postgresModel.info.name,
+							{
+								adminPassword: true,
+								noWait: true
+							},
+							Object.assign({ 'AZDATA_PASSWORD': password }, this._controllerModel.azdataAdditionalEnvVars));
 						vscode.window.showInformationMessage(loc.passwordReset);
 					}
 				} catch (error) {
@@ -259,13 +251,7 @@ export class PostgresOverviewPage extends DashboardPage {
 								cancellable: false
 							},
 							async (_progress, _token) => {
-								const session = await this._postgresModel.controllerModel.acquireAzdataSession();
-								try {
-									return await this._azdataApi.azdata.arc.postgres.server.delete(this._postgresModel.info.name, this._controllerModel.azdataAdditionalEnvVars, session);
-								} finally {
-									session.dispose();
-								}
-
+								return await this._azdataApi.azdata.arc.postgres.server.delete(this._postgresModel.info.name, this._controllerModel.azdataAdditionalEnvVars, this._controllerModel.controllerContext);
 							}
 						);
 						await this._controllerModel.refreshTreeNode();
--- a/extensions/arc/src/ui/dashboards/postgres/postgresParameters.ts
+++ b/extensions/arc/src/ui/dashboards/postgres/postgresParameters.ts
@@ -152,12 +152,7 @@ export abstract class PostgresParametersPage extends DashboardPage {
 								this.parameterUpdates.forEach((value, key) => {
 									engineSettings.push(`${key}="${value}"`);
 								});
-								const session = await this._postgresModel.controllerModel.acquireAzdataSession();
-								try {
-									await this.saveParameterEdits(engineSettings.toString(), session);
-								} finally {
-									session.dispose();
-								}
+								await this.saveParameterEdits(engineSettings.toString());
 							} catch (err) {
 								// If an error occurs while editing the instance then re-enable the save button since
 								// the edit wasn't successfully applied
@@ -230,12 +225,7 @@ export abstract class PostgresParametersPage extends DashboardPage {
 						},
 						async (_progress, _token): Promise<void> => {
 							try {
-								const session = await this._postgresModel.controllerModel.acquireAzdataSession();
-								try {
-									await this.resetAllParameters(session);
-								} finally {
-									session.dispose();
-								}
+								await this.resetAllParameters();
 							} catch (err) {
 								// If an error occurs while resetting the instance then re-enable the reset button since
 								// the edit wasn't successfully applied
@@ -423,12 +413,7 @@ export abstract class PostgresParametersPage extends DashboardPage {
 							cancellable: false
 						},
 						async (_progress, _token): Promise<void> => {
-							const session = await this._postgresModel.controllerModel.acquireAzdataSession();
-							try {
-								await this.resetParameter(engineSetting.parameterName!, session);
-							} finally {
-								session.dispose();
-							}
+							await this.resetParameter(engineSetting.parameterName!);
 							try {
 								await this._postgresModel.refresh();
 							} catch (error) {
@@ -633,9 +618,9 @@ export abstract class PostgresParametersPage extends DashboardPage {
 		}
 	}

-	protected abstract saveParameterEdits(engineSettings: string, session: azdataExt.AzdataSession): Promise<void>;
+	protected abstract saveParameterEdits(engineSettings: string): Promise<void>;

-	protected abstract resetAllParameters(session: azdataExt.AzdataSession): Promise<void>;
+	protected abstract resetAllParameters(): Promise<void>;

-	protected abstract resetParameter(parameterName: string, session: azdataExt.AzdataSession): Promise<void>;
+	protected abstract resetParameter(parameterName: string): Promise<void>;
 }
--- a/extensions/arc/src/ui/dashboards/postgres/postgresWorkerNodeParametersPage.ts
+++ b/extensions/arc/src/ui/dashboards/postgres/postgresWorkerNodeParametersPage.ts
@@ -4,7 +4,6 @@
 *--------------------------------------------------------------------------------------------*/

 import * as azdata from 'azdata';
-import * as azdataExt from 'azdata-ext';
 import * as loc from '../../../localizedConstants';
 import { IconPathHelper } from '../../../constants';
 import { PostgresParametersPage } from './postgresParameters';
@@ -35,34 +34,32 @@ export class PostgresWorkerNodeParametersPage extends PostgresParametersPage {
 		return loc.nodeParametersDescription;
 	}

+
 	protected get engineSettings(): EngineSettingsModel[] {
 		return this._postgresModel.workerNodesEngineSettings;
 	}

-	protected async saveParameterEdits(engineSettings: string, session: azdataExt.AzdataSession): Promise<void> {
+	protected async saveParameterEdits(engineSettings: string): Promise<void> {
 		await this._azdataApi.azdata.arc.postgres.server.edit(
 			this._postgresModel.info.name,
 			{ engineSettings: engineSettings },
-			this._postgresModel.engineVersion,
 			this._postgresModel.controllerModel.azdataAdditionalEnvVars,
-			session);
+			this._postgresModel.controllerModel.controllerContext);
 	}

-	protected async resetAllParameters(session: azdataExt.AzdataSession): Promise<void> {
+	protected async resetAllParameters(): Promise<void> {
 		await this._azdataApi.azdata.arc.postgres.server.edit(
 			this._postgresModel.info.name,
 			{ engineSettings: `''`, replaceEngineSettings: true },
-			this._postgresModel.engineVersion,
 			this._postgresModel.controllerModel.azdataAdditionalEnvVars,
-			session);
+			this._postgresModel.controllerModel.controllerContext);
 	}

-	protected async resetParameter(parameterName: string, session: azdataExt.AzdataSession): Promise<void> {
+	protected async resetParameter(parameterName: string): Promise<void> {
 		await this._azdataApi.azdata.arc.postgres.server.edit(
 			this._postgresModel.info.name,
 			{ engineSettings: parameterName + '=' },
-			this._postgresModel.engineVersion,
 			this._postgresModel.controllerModel.azdataAdditionalEnvVars,
-			session);
+			this._postgresModel.controllerModel.controllerContext);
 	}
 }
--- a/extensions/arc/src/ui/dialogs/connectControllerDialog.ts
+++ b/extensions/arc/src/ui/dialogs/connectControllerDialog.ts
@@ -15,7 +15,7 @@ import { InitializingComponent } from '../components/initializingComponent';
 import { AzureArcTreeDataProvider } from '../tree/azureArcTreeDataProvider';
 import { getErrorMessage } from '../../common/utils';
 import { RadioOptionsGroup } from '../components/radioOptionsGroup';
-import { getCurrentClusterContext, getDefaultKubeConfigPath, getKubeConfigClusterContexts } from '../../common/kubeUtils';
+import { getCurrentClusterContext, getDefaultKubeConfigPath, getKubeConfigClusterContexts, KubeClusterContext } from '../../common/kubeUtils';
 import { FilePicker } from '../components/filePicker';

 export type ConnectToControllerDialogModel = { controllerModel: ControllerModel, password: string };
@@ -25,24 +25,34 @@ abstract class ControllerDialogBase extends InitializingComponent {
 	protected modelBuilder!: azdata.ModelBuilder;
 	protected dialog: azdata.window.Dialog;

-	protected urlInputBox!: azdata.InputBoxComponent;
+	protected namespaceInputBox!: azdata.InputBoxComponent;
 	protected kubeConfigInputBox!: FilePicker;
 	protected clusterContextRadioGroup!: RadioOptionsGroup;
 	protected nameInputBox!: azdata.InputBoxComponent;
 	protected usernameInputBox!: azdata.InputBoxComponent;
 	protected passwordInputBox!: azdata.InputBoxComponent;
+	protected urlInputBox!: azdata.InputBoxComponent;
+
+	private _kubeClusters: KubeClusterContext[] = [];

 	protected dispose(): void {
 		this._toDispose.forEach(disposable => disposable.dispose());
-		this._toDispose.length = 0; // clear the _toDispose array
+		this._toDispose.length = 0;
 	}

 	protected getComponents(): (azdata.FormComponent<azdata.Component> & { layout?: azdata.FormItemLayout | undefined; })[] {
 		return [
+			{
+				component: this.namespaceInputBox,
+				title: loc.namespace,
+				required: true
+			},
 			{
 				component: this.urlInputBox,
 				title: loc.controllerUrl,
-				required: true
+				layout: {
+					info: loc.controllerUrlDescription
+				}
 			}, {
 				component: this.kubeConfigInputBox.component(),
 				title: loc.controllerKubeConfig,
@@ -54,14 +64,17 @@ abstract class ControllerDialogBase extends InitializingComponent {
 			}, {
 				component: this.nameInputBox,
 				title: loc.controllerName,
-				required: false
+				required: false,
+				layout: {
+					info: loc.controllerNameDescription
+				}
 			}, {
 				component: this.usernameInputBox,
-				title: loc.username,
+				title: loc.controllerUsername,
 				required: true
 			}, {
 				component: this.passwordInputBox,
-				title: loc.password,
+				title: loc.controllerPassword,
 				required: true
 			}
 		];
@@ -71,11 +84,14 @@ abstract class ControllerDialogBase extends InitializingComponent {
 	protected readonlyFields(): azdata.Component[] { return []; }

 	protected initializeFields(controllerInfo: ControllerInfo | undefined, password: string | undefined) {
+		this.namespaceInputBox = this.modelBuilder.inputBox()
+			.withProps({
+				value: controllerInfo?.namespace,
+			}).component();
 		this.urlInputBox = this.modelBuilder.inputBox()
-			.withProperties<azdata.InputBoxProperties>({
-				value: controllerInfo?.url,
-				// If we have a model then we're editing an existing connection so don't let them modify the URL
-				readOnly: !!controllerInfo
+			.withProps({
+				value: controllerInfo?.endpoint,
+				placeHolder: loc.controllerUrlPlaceholder,
 			}).component();
 		this.kubeConfigInputBox = new FilePicker(
 			this.modelBuilder,
@@ -83,22 +99,23 @@ abstract class ControllerDialogBase extends InitializingComponent {
 			(disposable) => this._toDispose.push(disposable)
 		);
 		this.modelBuilder.inputBox()
-			.withProperties<azdata.InputBoxProperties>({
+			.withProps({
 				value: controllerInfo?.kubeConfigFilePath || getDefaultKubeConfigPath()
 			}).component();
 		this.clusterContextRadioGroup = new RadioOptionsGroup(this.modelBuilder, (disposable) => this._toDispose.push(disposable));
 		this.loadRadioGroup(controllerInfo?.kubeClusterContext);
+		this._toDispose.push(this.clusterContextRadioGroup.onRadioOptionChanged(newContext => this.updateNamespace(newContext)));
 		this._toDispose.push(this.kubeConfigInputBox.onTextChanged(() => this.loadRadioGroup(controllerInfo?.kubeClusterContext)));
 		this.nameInputBox = this.modelBuilder.inputBox()
-			.withProperties<azdata.InputBoxProperties>({
+			.withProps({
 				value: controllerInfo?.name
 			}).component();
 		this.usernameInputBox = this.modelBuilder.inputBox()
-			.withProperties<azdata.InputBoxProperties>({
+			.withProps({
 				value: controllerInfo?.username
 			}).component();
 		this.passwordInputBox = this.modelBuilder.inputBox()
-			.withProperties<azdata.InputBoxProperties>({
+			.withProps({
 				inputType: 'password',
 				value: password
 			}).component();
@@ -114,15 +131,22 @@ abstract class ControllerDialogBase extends InitializingComponent {
 	}

 	private loadRadioGroup(previousClusterContext?: string): void {
-		this.clusterContextRadioGroup.load(async () => {
-			const clusters = await getKubeConfigClusterContexts(this.kubeConfigInputBox.value!);
+		this.clusterContextRadioGroup.load(() => {
+			this._kubeClusters = getKubeConfigClusterContexts(this.kubeConfigInputBox.value!);
+			const currentClusterContext = getCurrentClusterContext(this._kubeClusters, previousClusterContext, false);
+			this.namespaceInputBox.value = currentClusterContext.namespace || this.namespaceInputBox.value;
 			return {
-				values: clusters.map(c => c.name),
-				defaultValue: getCurrentClusterContext(clusters, previousClusterContext, false),
+				values: this._kubeClusters.map(c => c.name),
+				defaultValue: currentClusterContext.name
 			};
 		});
 	}

+	private updateNamespace(currentContextName: string | undefined): void {
+		const currentContext = this._kubeClusters.find(cluster => cluster.name === currentContextName);
+		this.namespaceInputBox.value = currentContext?.namespace;
+	}
+
 	public showDialog(controllerInfo?: ControllerInfo, password: string | undefined = undefined): azdata.window.Dialog {
 		this.id = controllerInfo?.id ?? uuid();
 		this.resources = controllerInfo?.resources ?? [];
@@ -168,7 +192,8 @@ abstract class ControllerDialogBase extends InitializingComponent {
 	protected getControllerInfo(url: string, rememberPassword: boolean = false): ControllerInfo {
 		return {
 			id: this.id,
-			url: url,
+			endpoint: url || undefined,
+			namespace: this.namespaceInputBox.value!,
 			kubeConfigFilePath: this.kubeConfigInputBox.value!,
 			kubeClusterContext: this.clusterContextRadioGroup.value!,
 			name: this.nameInputBox.value ?? '',
@@ -183,7 +208,7 @@ export class ConnectToControllerDialog extends ControllerDialogBase {
 	protected rememberPwCheckBox!: azdata.CheckBoxComponent;

 	protected fieldToFocusOn() {
-		return this.urlInputBox;
+		return this.namespaceInputBox;
 	}

 	protected getComponents() {
@@ -209,22 +234,25 @@ export class ConnectToControllerDialog extends ControllerDialogBase {
 	}

 	public async validate(): Promise<boolean> {
-		if (!this.urlInputBox.value || !this.usernameInputBox.value || !this.passwordInputBox.value) {
+		if (!this.namespaceInputBox.value || !this.usernameInputBox.value || !this.passwordInputBox.value) {
 			return false;
 		}
-		let url = this.urlInputBox.value;
-		// Only support https connections
-		if (url.toLowerCase().startsWith('http://')) {
-			url = url.replace('http', 'https');
-		}
-		// Append https if they didn't type it in
-		if (!url.toLowerCase().startsWith('https://')) {
-			url = `https://${url}`;
-		}
-		// Append default port if one wasn't specified
-		if (!/.*:\d*$/.test(url)) {
-			url = `${url}:30080`;
+		let url = this.urlInputBox.value || '';
+		if (url) {
+			// Only support https connections
+			if (url.toLowerCase().startsWith('http://')) {
+				url = url.replace('http', 'https');
+			}
+			// Append https if they didn't type it in
+			if (!url.toLowerCase().startsWith('https://')) {
+				url = `https://${url}`;
+			}
+			// Append default port if one wasn't specified
+			if (!/.*:\d*$/.test(url)) {
+				url = `${url}:30080`;
+			}
 		}
+
 		const controllerInfo: ControllerInfo = this.getControllerInfo(url, !!this.rememberPwCheckBox.checked);
 		const controllerModel = new ControllerModel(this.treeDataProvider, controllerInfo, this.passwordInputBox.value);
 		try {
@@ -234,7 +262,7 @@ export class ConnectToControllerDialog extends ControllerDialogBase {
 			controllerModel.info.name = controllerModel.info.name || controllerModel.controllerConfig?.metadata.name || loc.defaultControllerName;
 		} catch (err) {
 			this.dialog.message = {
-				text: loc.connectToControllerFailed(this.urlInputBox.value, err),
+				text: loc.connectToControllerFailed(this.namespaceInputBox.value, err),
 				level: azdata.window.MessageLevel.Error
 			};
 			return false;
@@ -267,11 +295,16 @@ export class PasswordToControllerDialog extends ControllerDialogBase {
 		if (!this.passwordInputBox.value) {
 			return false;
 		}
+		const controllerInfo: ControllerInfo = this.getControllerInfo(this.urlInputBox.value!, false);
+		const controllerModel = new ControllerModel(this.treeDataProvider, controllerInfo, this.passwordInputBox.value);
 		const azdataApi = <azdataExt.IExtension>vscode.extensions.getExtension(azdataExt.extension.name)?.exports;
 		try {
 			await azdataApi.azdata.login(
-				this.urlInputBox.value!,
-				this.usernameInputBox.value!,
+				{
+					endpoint: controllerInfo.endpoint,
+					namespace: controllerInfo.namespace
+				},
+				controllerInfo.username,
 				this.passwordInputBox.value,
 				{
 					'KUBECONFIG': this.kubeConfigInputBox.value!,
@@ -293,8 +326,6 @@ export class PasswordToControllerDialog extends ControllerDialogBase {
 				return false;
 			}
 		}
-		const controllerInfo: ControllerInfo = this.getControllerInfo(this.urlInputBox.value!, false);
-		const controllerModel = new ControllerModel(this.treeDataProvider, controllerInfo, this.passwordInputBox.value);
 		this.completionPromise.resolve({ controllerModel: controllerModel, password: this.passwordInputBox.value });
 		return true;
 	}
--- a/extensions/arc/src/ui/tree/azureArcTreeDataProvider.ts
+++ b/extensions/arc/src/ui/tree/azureArcTreeDataProvider.ts
@@ -10,7 +10,7 @@ import { ControllerModel } from '../../models/controllerModel';
 import { ControllerTreeNode } from './controllerTreeNode';
 import { TreeNode } from './treeNode';

-const mementoToken = 'arcDataControllers';
+const mementoToken = 'arcDataControllers.v2';

 /**
 * The TreeDataProvider for the Azure Arc view, which displays a list of registered
--- a/extensions/arc/src/ui/tree/controllerTreeNode.ts
+++ b/extensions/arc/src/ui/tree/controllerTreeNode.ts
@@ -44,7 +44,7 @@ export class ControllerTreeNode extends TreeNode {
 		} catch (err) {
 			vscode.window.showErrorMessage(loc.errorConnectingToController(err));
 			try {
-				await this.model.refresh(false, true);
+				await this.model.refresh(false);
 				this.updateChildren(this.model.registrations);
 			} catch (err) {
 				if (!(err instanceof UserCancelledError)) {