From 52a223e9ff69584c3610b7a9a976b405f8a468b1 Mon Sep 17 00:00:00 2001 From: nasc17 <69922333+nasc17@users.noreply.github.com> Date: Fri, 28 May 2021 08:37:18 -0700 Subject: [PATCH] Use namespace for azdata login with postgres deployment (#15592) * Azdata login uses namespace since required, checks for endpoint * Change back version * Remove tabs --- .../notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb | 3 ++- extensions/arc/package.json | 1 + .../arc/src/providers/arcControllersOptionsSourceProvider.ts | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb b/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb index e73e612156..eae4b1f6eb 100644 --- a/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb +++ b/extensions/arc/notebooks/arcDeployment/deploy.postgres.existing.arc.ipynb @@ -117,7 +117,8 @@ "os.environ[\"AZDATA_PASSWORD\"] = os.environ[\"AZDATA_NB_VAR_CONTROLLER_PASSWORD\"]\n", "os.environ[\"KUBECONFIG\"] = controller_kubeconfig\n", "os.environ[\"KUBECTL_CONTEXT\"] = controller_kubectl_context\n", - "cmd = f'azdata login -e {controller_endpoint} -u {controller_username}'\n", + "endpoint_option = f' -e {controller_endpoint}' if controller_endpoint else \"\"\n", + "cmd = f'azdata login --namespace {arc_data_controller_namespace} -u {controller_username}{endpoint_option}'\n", "out=run_command()" ], "metadata": { diff --git a/extensions/arc/package.json b/extensions/arc/package.json index a72cb7f5c1..5574da0f55 100644 --- a/extensions/arc/package.json +++ b/extensions/arc/package.json @@ -572,6 +572,7 @@ "source": { "providerId": "arc.controllers", "variableNames": { + "namespace": "AZDATA_NB_VAR_ARC_DATA_CONTROLLER_NAMESPACE", "endpoint": "AZDATA_NB_VAR_CONTROLLER_ENDPOINT", "username": "AZDATA_NB_VAR_CONTROLLER_USERNAME", "kubeConfig": "AZDATA_NB_VAR_CONTROLLER_KUBECONFIG", diff --git a/extensions/arc/src/providers/arcControllersOptionsSourceProvider.ts b/extensions/arc/src/providers/arcControllersOptionsSourceProvider.ts index a320c753ad..2c944f7696 100644 --- a/extensions/arc/src/providers/arcControllersOptionsSourceProvider.ts +++ b/extensions/arc/src/providers/arcControllersOptionsSourceProvider.ts @@ -30,6 +30,7 @@ export class ArcControllersOptionsSourceProvider implements rd.IOptionsSourcePro const controller = (await getRegisteredDataControllers(this._treeProvider)).find(ci => ci.label === controllerLabel); throwUnless(controller !== undefined, loc.noControllerInfoFound(controllerLabel)); switch (variableName) { + case 'namespace': return controller.info.namespace || ''; case 'endpoint': return controller.info.endpoint || ''; case 'username': return controller.info.username; case 'kubeConfig': return controller.info.kubeConfigFilePath; @@ -50,6 +51,7 @@ export class ArcControllersOptionsSourceProvider implements rd.IOptionsSourcePro public getIsPassword(variableName: string): boolean { switch (variableName) { + case 'namespace': return false; case 'endpoint': return false; case 'username': return false; case 'kubeConfig': return false;