diff --git a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/KubeClientFactory.java b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/KubeClientFactory.java index 65c142d49bdc7f70f49f3433ec36208193cc8ca1..5635654a3894b8fefac5a30ba37747373540b9ac 100644 --- a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/KubeClientFactory.java +++ b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/KubeClientFactory.java @@ -20,7 +20,7 @@ package org.apache.flink.kubernetes.kubeclient; import org.apache.flink.configuration.Configuration; import org.apache.flink.kubernetes.configuration.KubernetesConfigOptions; -import org.apache.flink.kubernetes.utils.KubernetesUtils; +import org.apache.flink.util.FileUtils; import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.DefaultKubernetesClient; @@ -29,6 +29,7 @@ import io.fabric8.kubernetes.client.KubernetesClientException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; import java.io.IOException; /** @@ -55,7 +56,7 @@ public class KubeClientFactory { // Note: the third parameter kubeconfigPath is optional and is set to null. It is only used to rewrite // relative tls asset paths inside kubeconfig when a file is passed, and in the case that the kubeconfig // references some assets via relative paths. - config = Config.fromKubeconfig(kubeContext, KubernetesUtils.getContentFromFile(kubeConfigFile), null); + config = Config.fromKubeconfig(kubeContext, FileUtils.readFileUtf8(new File(kubeConfigFile)), null); } catch (IOException e) { throw new KubernetesClientException("Load kubernetes config failed.", e); } diff --git a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java index f0c6f138792ac0440f6935c0db40decb711f3dfd..d3ec4113e3c619fffc6d3b87a0856a31a890abc8 100644 --- a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java +++ b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java @@ -33,12 +33,6 @@ import org.slf4j.LoggerFactory; import javax.annotation.Nullable; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStreamReader; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -52,29 +46,6 @@ public class KubernetesUtils { private static final Logger LOG = LoggerFactory.getLogger(KubernetesUtils.class); - /** - * Read file content to string. - * - * @param filePath file path - * @return content - */ - public static String getContentFromFile(String filePath) throws FileNotFoundException { - File file = new File(filePath); - if (file.exists()) { - StringBuilder content = new StringBuilder(); - String line; - try (BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)))){ - while ((line = reader.readLine()) != null) { - content.append(line).append(System.lineSeparator()); - } - } catch (IOException e) { - throw new RuntimeException("Error read file content.", e); - } - return content.toString(); - } - throw new FileNotFoundException("File " + filePath + " not exists."); - } - /** * Check whether the port config option is a fixed port. If not, the fallback port will be set to configuration. * @param flinkConfig flink configuration