Merge pull request #580 from adrianord/preserveContextFromStartingFile

Preserve context from starting file

Author: k8s-ci-robot

src/config.ts

@@ -231,8 +231,10 @@ export class KubeConfig {
         this.currentContext = contextName;
     }
 
-    public mergeConfig(config: KubeConfig): void {
-        this.currentContext = config.currentContext;
+    public mergeConfig(config: KubeConfig, preserveContext: boolean = false): void {
+        if (!preserveContext) {
+            this.currentContext = config.currentContext;
+        }
         config.clusters.forEach((cluster: Cluster) => {
             this.addCluster(cluster);
         });
@@ -280,14 +282,14 @@ export class KubeConfig {
         this.contexts.push(ctx);
     }
 
-    public loadFromDefault(opts?: Partial<ConfigOptions>): void {
+    public loadFromDefault(opts?: Partial<ConfigOptions>, contextFromStartingConfig: boolean = false): void {
         if (process.env.KUBECONFIG && process.env.KUBECONFIG.length > 0) {
             const files = process.env.KUBECONFIG.split(path.delimiter);
             this.loadFromFile(files[0], opts);
             for (let i = 1; i < files.length; i++) {
                 const kc = new KubeConfig();
                 kc.loadFromFile(files[i], opts);
-                this.mergeConfig(kc);
+                this.mergeConfig(kc, contextFromStartingConfig);
             }
             return;
         }

src/config_test.ts

@@ -1036,6 +1036,14 @@ describe('KubeConfig', () => {
             expect(kc.contexts.length).to.equal(4);
             expect(kc.getCurrentContext()).to.equal('contextA');
         });
+        it('should preserve starting file context', () => {
+            process.env.KUBECONFIG = kcFileName + path.delimiter + kc2FileName;
+
+            const kc = new KubeConfig();
+            kc.loadFromDefault({}, true);
+
+            expect(kc.getCurrentContext()).to.equal('context2');
+        });
         it('should throw with duplicate clusters', () => {
             process.env.KUBECONFIG = kcFileName + path.delimiter + kcDupeCluster;