fix: only use first config file when logging in, avoid oc adding contexts (#966)

Signed-off-by: Andre Dietisheim <[email protected]>

Author: adietish

gradle.properties

@@ -11,7 +11,7 @@ gradleVersion=8.5
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
 platformBundledPlugins=com.intellij.java, org.jetbrains.plugins.yaml, org.jetbrains.plugins.terminal
-platformPlugins=com.redhat.devtools.intellij.telemetry:1.2.1.62, com.redhat.devtools.intellij.kubernetes:1.4.0.4
+platformPlugins=com.redhat.devtools.intellij.telemetry:1.2.1.62
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild=231

gradle/libs.versions.toml

@@ -2,7 +2,7 @@
 # libraries
 junit = "4.13.2"
 openshift-client = "7.0.0"
-devtools-common = "1.9.7"
+devtools-common = "1.9.8-SNAPSHOT"
 keycloak = "24.0.5"
 jsonwebtoken = "0.12.6"
 retrofit2 = "2.11.0"

src/main/java/org/jboss/tools/intellij/openshift/utils/KubeconfigEnvValue.java

@@ -0,0 +1,34 @@
+package org.jboss.tools.intellij.openshift.utils;
+
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.EnvironmentUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class KubeconfigEnvValue {
+
+  private static final String KUBECONFIG_KEY = "KUBECONFIG";
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(KubeconfigEnvValue.class);
+
+  private KubeconfigEnvValue() {
+    // inhibit instantiation
+  }
+
+  public static void copyToSystem() {
+    String current = System.getProperty(KUBECONFIG_KEY);
+    if (!StringUtil.isEmpty(current)) {
+      LOGGER.info("Current KUBECONFIG value is " + current + ".");
+      return;
+    }
+    String shellValue = EnvironmentUtil.getValue(KUBECONFIG_KEY);
+    if (StringUtil.isEmpty(shellValue)) {
+      return;
+    }
+    LOGGER.info("Copying KUBECONFIG value " + shellValue+ " from shell to System.");
+    System.getProperties().put(KUBECONFIG_KEY, shellValue);
+    System.getProperties().put(KUBECONFIG_KEY.toLowerCase(), shellValue);
+  }
+
+
+}

src/main/java/org/jboss/tools/intellij/openshift/utils/KubernetesClientFactory.java

@@ -46,6 +46,7 @@ public KubernetesClient create(String context) {
 
   @Override
   public KubernetesClient apply(Config config) {
+    KubeconfigEnvValue.copyToSystem();
     return new KubernetesClientBuilder()
       .withConfig(config)
       .withHttpClientBuilderConsumer(builder -> setSslContext(builder, config))

src/main/java/org/jboss/tools/intellij/openshift/utils/oc/OcCli.java

@@ -13,10 +13,13 @@
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.util.messages.MessageBus;
 import com.redhat.devtools.intellij.common.utils.ExecHelper;
+import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.KubernetesClient;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.function.Function;
 import org.jboss.tools.intellij.openshift.utils.Cli;
@@ -60,11 +63,18 @@ private static void execute(@NotNull File workingDirectory, String command, Map<
 
   @Override
   public void login(String url, String userName, char[] password, char[] token) throws IOException {
+    var args = new ArrayList<String>();
+    args.add("login");
+    args.add(url);
+    args.add("--kubeconfig");
+    args.add(Config.getKubeconfigFilename());
+    args.add("--insecure-skip-tls-verify") ;
     if (userName != null && !userName.isEmpty()) {
-      execute(new File(HOME_FOLDER), command, envVars, "login", url, "-u", userName, "-p", String.valueOf(password), "--insecure-skip-tls-verify");
+      args.addAll(Arrays.asList("-u", userName, "-p", String.valueOf(password)));
     } else {
-      execute(new File(HOME_FOLDER), command, envVars, "login", url, "--token", String.valueOf(token), "--insecure-skip-tls-verify");
+      args.addAll(Arrays.asList("--token", String.valueOf(token)));
     }
+    execute(new File(HOME_FOLDER), command, envVars, args.toArray(new String[0]));
   }
 
   @Override