Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
doujutun3207
flink
提交
0622ef7c
F
flink
项目概览
doujutun3207
/
flink
与 Fork 源项目一致
从无法访问的项目Fork
通知
24
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
flink
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
0622ef7c
编写于
4月 02, 2020
作者:
C
Canbin Zheng
提交者:
GitHub
4月 02, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FLINK-16737][k8s] Remove KubernetesUtils#getContentFromFile
This closes #11569 .
上级
d39f5b33
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
3 addition
and
31 deletion
+3
-31
flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/KubeClientFactory.java
...apache/flink/kubernetes/kubeclient/KubeClientFactory.java
+3
-2
flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java
...va/org/apache/flink/kubernetes/utils/KubernetesUtils.java
+0
-29
未找到文件。
flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/KubeClientFactory.java
浏览文件 @
0622ef7c
...
...
@@ -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.Kubernetes
Utils
;
import
org.apache.flink.
util.File
Utils
;
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
);
}
...
...
flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java
浏览文件 @
0622ef7c
...
...
@@ -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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录