bump kubernetes-client to 7.0.0 (redhat-developer#247)

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

Author: adietish

src/main/java/com/redhat/devtools/intellij/common/kubernetes/ClusterHelper.java

@@ -16,36 +16,32 @@
 import io.fabric8.kubernetes.client.VersionInfo;
 import io.fabric8.openshift.client.OpenShiftClient;
 
-import java.net.HttpURLConnection;
-
 public class ClusterHelper {
 
     private ClusterHelper() {
         //avoid instanciation
     }
 
     public static boolean isOpenShift(KubernetesClient client) {
-        return client.hasApiGroup(OpenShiftClient.BASE_API_GROUP, false);
+        try {
+            return client.hasApiGroup(OpenShiftClient.BASE_API_GROUP, false);
+        } catch (KubernetesClientException e) {
+            return false;
+        }
     }
 
     public static ClusterInfo getClusterInfo(KubernetesClient client) {
-        if (client instanceof OpenShiftClient) {
-            return new ClusterInfo(
-                    getKubernetesVersion((OpenShiftClient) client),
-                    true,
-                    getOpenShiftVersion((OpenShiftClient) client));
-
-        } else if (client.adapt(OpenShiftClient.class) != null && client.adapt(OpenShiftClient.class).isSupported()){
+        OpenShiftClient openShiftClient = getOpenShiftClient(client);
+        if (openShiftClient != null) {
             return new ClusterInfo(
-                    getKubernetesVersion(client),
+                    getKubernetesVersion(openShiftClient),
                     true,
-                    getOpenShiftVersion(client));
+                    getOpenShiftVersion(openShiftClient));
         } else {
             return new ClusterInfo(
                     getKubernetesVersion(client),
                     false,
                     "");
-
         }
     }
 
@@ -63,18 +59,21 @@ private static String getKubernetesVersion(KubernetesClient client) {
         return version != null ? version.getGitVersion() : "";
     }
 
-    private static String getOpenShiftVersion(KubernetesClient client) {
-        try {
-            OpenShiftClient oclient = client.adapt(OpenShiftClient.class);
-            return getOpenShiftVersion(oclient);
-        } catch (KubernetesClientException e) {
+    private static OpenShiftClient getOpenShiftClient(KubernetesClient client) {
+        if (client instanceof OpenShiftClient) {
+            return (OpenShiftClient) client;
+        } else if (isOpenShift(client)) {
+            return client.adapt(OpenShiftClient.class);
+        } else {
             return null;
         }
     }
 
     private static String getOpenShiftVersion(OpenShiftClient client) {
         VersionInfo version = client.getVersion();
-        return version != null && version.getMajor() != null ? getVersion(version.getMajor(), version.getMinor()) : "";
+        return version != null && version.getMajor() != null ?
+                getVersion(version.getMajor(), version.getMinor())
+                : "";
     }
 
     private static String getVersion(String major, String minor) {

src/main/java/com/redhat/devtools/intellij/common/utils/ConfigHelper.java

@@ -19,6 +19,7 @@
 import io.fabric8.kubernetes.api.model.ConfigBuilder;
 import io.fabric8.kubernetes.api.model.Context;
 import io.fabric8.kubernetes.api.model.NamedContext;
+import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.internal.KubeConfigUtils;
 
 import java.io.File;
@@ -32,34 +33,23 @@ public class ConfigHelper {
     private static final ObjectMapper mapper = new ObjectMapper(new YAMLFactory());
 
     public static String getKubeConfigPath() {
-        return io.fabric8.kubernetes.client.Config.getKubeconfigFilename();
-    }
-
-    public static void saveKubeConfig(Config config) throws IOException {
-        mapper.writeValue(new File(getKubeConfigPath()), config);
+        Collection<String> filenames = io.fabric8.kubernetes.client.Config.getKubeconfigFilenames();
+        if (filenames == null || filenames.isEmpty()) {
+            return null;
+        }
+        return filenames.stream()
+                .filter(filename -> filename.endsWith("config"))
+                .findAny()
+                .orElse(null);
     }
-
     public static Config safeLoadKubeConfig() {
         try {
-            return loadKubeConfig();
-        } catch (IOException e) {
+            return io.fabric8.kubernetes.client.Config.builder().build();
+        } catch (KubernetesClientException e) {
             return null;
         }
     }
 
-    public static Config loadKubeConfig() throws IOException {
-        return loadKubeConfig(getKubeConfigPath());
-    }
-
-    public static Config loadKubeConfig(String path) throws IOException {
-        File f = new File(path);
-        if (f.exists()) {
-            return KubeConfigUtils.parseConfig(f);
-        } else {
-            return new ConfigBuilder().build();
-        }
-    }
-
     public static boolean isKubeConfigParsable() {
         return isKubeConfigParsable(new File(getKubeConfigPath()));
     }
@@ -85,63 +75,24 @@ public static ToolsConfig loadToolsConfig(URL url) throws IOException {
         }
     }
 
-    public static NamedContext getCurrentContext() {
-        try {
-            Config config = loadKubeConfig();
-            return getCurrentContext(config);
-        } catch (IOException e) {
-            return null;
-        }
-    }
-
-    public static NamedContext getCurrentContext(Config config) {
-        if (config == null) {
+    public static String getCurrentContextName(io.fabric8.kubernetes.client.Config config) {
+        NamedContext current = config.getCurrentContext();
+        if (current == null) {
             return null;
+        } else {
+            return current.getName();
         }
-        return KubeConfigUtils.getCurrentContext(config);
-    }
-
-    public static String getCurrentContextName(Config config) {
-        String current = null;
-        NamedContext currentContext = getCurrentContext(config);
-        if (currentContext != null
-                && currentContext.getName() != null) {
-            current = currentContext.getName();
-        }
-        return current;
     }
 
-    public static String getCurrentContextName() {
-        try {
-            return getCurrentContextName(loadKubeConfig());
-        } catch (IOException e) {
-            return null;
+    public static boolean areEqual(io.fabric8.kubernetes.client.Config thisConfig, io.fabric8.kubernetes.client.Config thatConfig) {
+        if (thisConfig == null) {
+            return thatConfig == null;
         }
-    }
-
-    /**
-     * Returns {@code true} if the given {@link io.fabric8.kubernetes.api.model.Config} and
-     * the new {@link io.fabric8.kubernetes.api.model.Config} are equal. They are considered equal if they're
-     * equal in
-     * <ul>
-     *     <li>current context (cluster, user, current namespace, extensions)</li>
-     *     <li>(authentication) token</li>
-     * </ul>
-     *
-     * @param kubeConfig the (file) config to compare
-     * @param newKubeConfig the (client, runtime) config to compare
-     * @return true if both configs are equal in context, contexts and token
-     */
-    public static boolean areEqualCurrentContext(Config kubeConfig, Config newKubeConfig) {
-        if (newKubeConfig == null) {
-            return kubeConfig == null;
-        } else if (kubeConfig == null) {
+        if (thatConfig == null) {
             return false;
         }
-        return areEqual(KubeConfigUtils.getCurrentContext(newKubeConfig), KubeConfigUtils.getCurrentContext(kubeConfig))
-                && areEqualToken(kubeConfig, newKubeConfig);
+        return thisConfig.equals(thatConfig);
     }
-
     /**
      * Returns {@code true} if the given {@link io.fabric8.kubernetes.api.model.Config} and
      * (client runtime) {@link io.fabric8.kubernetes.client.Config} are equal. They are considered equal if they're
@@ -157,14 +108,16 @@ public static boolean areEqualCurrentContext(Config kubeConfig, Config newKubeCo
      * @return true if both configs are equal in context, contexts and token
      */
     public static boolean areEqual(Config kubeConfig, io.fabric8.kubernetes.client.Config clientConfig) {
-        if (clientConfig == null) {
+/*        if (clientConfig == null) {
             return kubeConfig == null;
         } else if (kubeConfig == null) {
             return false;
         }
         return areEqual(clientConfig.getCurrentContext(), KubeConfigUtils.getCurrentContext(kubeConfig))
                 && areEqual(clientConfig.getContexts(), kubeConfig.getContexts())
         			&& areEqualToken(kubeConfig, clientConfig);
+*/
+        return false;
     }
 
     /**
@@ -181,6 +134,7 @@ && areEqual(clientConfig.getContexts(), kubeConfig.getContexts())
      * @param thatConfig the second (file) config to compare
      * @return true if both configs are equal in context, contexts and token
      */
+/*
     public static boolean areEqual(Config thisConfig, Config thatConfig) {
         if (thisConfig == null) {
             return thatConfig == null;
@@ -191,7 +145,7 @@ public static boolean areEqual(Config thisConfig, Config thatConfig) {
                 && areEqual(thisConfig.getContexts(), thatConfig.getContexts())
                 && areEqualToken(getAuthInfo(thisConfig), getAuthInfo(thatConfig));
     }
-
+*/
     /**
      * Returns {@code true} if both given contexts are equal. They are considered equal if they're equal in
      * <ul>
@@ -266,10 +220,11 @@ private static boolean contains(NamedContext namedContext, Collection<NamedConte
      * @param clientConfig the (client) config that contains the token
      * @return true if both tokens are equal, false otherwise
      */
+/*
     public static boolean areEqualToken(Config kubeConfig, io.fabric8.kubernetes.client.Config clientConfig) {
         return areEqualToken(getAuthInfo(kubeConfig), clientConfig);
     }
-
+*/
     /**
      * Returns {@code true} if the token in the given (kubernetes file) {@link io.fabric8.kubernetes.api.model.Config}
      * and the one in the new Kubernetes file {@link io.fabric8.kubernetes.api.model.Config} are equal.
@@ -279,18 +234,20 @@ public static boolean areEqualToken(Config kubeConfig, io.fabric8.kubernetes.cli
      * @param newKubeConfig the (client) config that contains the token
      * @return true if both tokens are equal, false otherwise
      */
+/*
     public static boolean areEqualToken(Config kubeConfig, Config newKubeConfig) {
         return areEqualToken(getAuthInfo(kubeConfig), getAuthInfo(newKubeConfig));
     }
-
+*/
+/*
     private static AuthInfo getAuthInfo(Config kubeConfig) {
         NamedContext current = KubeConfigUtils.getCurrentContext(kubeConfig);
         if (current == null) {
             return null;
         }
         return KubeConfigUtils.getUserAuthInfo(kubeConfig, current.getContext());
     }
-
+*/
     /**
      * Returns {@code true} if the token in the given {@link AuthInfo} (that's retrieved from the kube config file)
      * and {@link Config} (that's contains the runtime settings that the kubernetes-client is using) are equal.