load the remote config

Signed-off-by: Jeromy Cannon <[email protected]>

src/core/config/remote/remote_config_manager.ts

@@ -162,13 +162,15 @@ export class RemoteConfigManager {
 
   /**
    * Loads the remote configuration from the Kubernetes cluster if it exists.
+   * @param namespace - The namespace to search for the ConfigMap.
+   * @param context - The context to use for the Kubernetes client.
    * @returns true if the configuration is loaded successfully.
    */
-  private async load(): Promise<boolean> {
+  private async load(namespace?: NamespaceName, context?: string): Promise<boolean> {
     if (this.remoteConfig) return true;
 
     try {
-      const configMap = await this.getConfigMap();
+      const configMap = await this.getConfigMap(namespace, context);
 
       if (configMap) {
         this.remoteConfig = RemoteConfigDataWrapper.fromConfigmap(this.configManager, configMap);
@@ -361,15 +363,24 @@ export class RemoteConfigManager {
   /**
    * Retrieves the ConfigMap containing the remote configuration from the Kubernetes cluster.
    *
+   * @param namespace - The namespace to search for the ConfigMap.
+   * @param context - The context to use for the Kubernetes client.
    * @returns the remote configuration data.
    * @throws {@link SoloError} if the ConfigMap could not be read and the error is not a 404 status.
    */
-  public async getConfigMap(): Promise<k8s.V1ConfigMap> {
+  public async getConfigMap(namespace?: NamespaceName, context?: string): Promise<k8s.V1ConfigMap> {
+    if (!namespace) {
+      namespace = await this.getNamespace();
+    }
+    if (!context) {
+      const contexts: string[] = this.getContexts();
+      if (contexts.length > 0) {
+        context = contexts[0];
+      }
+    }
+
     try {
-      return await this.k8Factory
-        .default()
-        .configMaps()
-        .read(await this.getNamespace(), constants.SOLO_REMOTE_CONFIGMAP_NAME);
+      return await this.k8Factory.getK8(context).configMaps().read(namespace, constants.SOLO_REMOTE_CONFIGMAP_NAME);
     } catch (e) {
       if (!(e instanceof ResourceNotFoundError)) {
         throw new SoloError('Failed to read remote config from cluster', e);

src/core/resolvers.ts

@@ -31,7 +31,9 @@ export async function promptTheUserForDeployment(
   configManager: ConfigManager,
   task?: SoloListrTaskWrapper<any>,
 ): Promise<Optional<DeploymentName>> {
-  if (configManager.getFlag(flags.deployment)) return undefined;
+  if (configManager.getFlag(flags.deployment)) {
+    return configManager.getFlag<DeploymentName>(flags.deployment);
+  }
 
   if (!task) {
     const isQuiet = configManager.getFlag<boolean>(flags.quiet);

test/e2e/commands/dual_cluster_full.test.ts

@@ -241,8 +241,10 @@ describe('Dual Cluster Full E2E Test', async function dualClusterFullE2eTest():
     expect(remoteConfigManager.isLoaded(), 'remote config manager should not be loaded').to.be.false;
     const configManager: ConfigManager = container.resolve(InjectTokens.ConfigManager);
     configManager.setFlag(Flags.namespace, namespace);
+    configManager.setFlag(Flags.deployment, deployment);
+
     // @ts-ignore
-    await remoteConfigManager.load();
+    await remoteConfigManager.load(namespace, contexts[0]);
     expect(remoteConfigManager.isLoaded(), 'remote config manager should be loaded').to.be.true;
     expect(
       Object.entries(remoteConfigManager.components.consensusNodes).length,

test/test_container.ts

@@ -30,6 +30,6 @@ export function resetForTest(namespace?: NamespaceNameAsString, cacheDir: string
   // need to init the container prior to using K8Client for dependency injection to work
   resetTestContainer(cacheDir);
 
-  parsedData.clusterRefs['cluster-1'] = new K8Client(undefined).contexts().readCurrent();
+  parsedData.clusterRefs['cluster-1'] = new K8Client('kind-solo-e2e').contexts().readCurrent();
   fs.writeFileSync(path.join(cacheDirectory, localConfigFile), yaml.stringify(parsedData));
 }