This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new 85b795882 [Improve] Update the 'streampark.yarn.http-auth'
configuration from 'sample' to 'simple' (#3289)
85b795882 is described below
commit 85b7958825b8e63956a1e85a0daa5df25ca44249
Author: 阿甘兄 <[email protected]>
AuthorDate: Thu Oct 26 14:03:24 2023 +0800
[Improve] Update the 'streampark.yarn.http-auth' configuration from
'sample' to 'simple' (#3289)
---
.../streampark/conf/streampark-console-config/application.yml | 4 ++--
.../scala/org/apache/streampark/common/conf/CommonConfig.scala | 2 +-
.../main/scala/org/apache/streampark/common/util/YarnUtils.scala | 8 ++++----
.../streampark-console-service/src/main/resources/application.yml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/deploy/helm/streampark/conf/streampark-console-config/application.yml
b/deploy/helm/streampark/conf/streampark-console-config/application.yml
index f947a85db..66a92ec7a 100755
--- a/deploy/helm/streampark/conf/streampark-console-config/application.yml
+++ b/deploy/helm/streampark/conf/streampark-console-config/application.yml
@@ -92,8 +92,8 @@ streampark:
# lark alert proxy,default https://open.feishu.cn
lark-url:
yarn:
- # default sample, or kerberos
- http-auth: sample
+ # default simple, or kerberos
+ http-auth: simple
# HADOOP_USER_NAME
hadoop-user-name: hdfs
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/conf/CommonConfig.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/conf/CommonConfig.scala
index e9178bc19..449b0c2dd 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/conf/CommonConfig.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/conf/CommonConfig.scala
@@ -45,7 +45,7 @@ object CommonConfig {
key = "streampark.yarn.http-auth",
defaultValue = "",
classType = classOf[String],
- description = "yarn http auth type. ex: sample, kerberos")
+ description = "yarn http auth type. ex: simple, kerberos")
val DOCKER_HOST: InternalOption = InternalOption(
key = "streampark.docker.http-client.docker-host",
diff --git
a/streampark-common/src/main/scala/org/apache/streampark/common/util/YarnUtils.scala
b/streampark-common/src/main/scala/org/apache/streampark/common/util/YarnUtils.scala
index 2839bcc5e..f0464cfc3 100644
---
a/streampark-common/src/main/scala/org/apache/streampark/common/util/YarnUtils.scala
+++
b/streampark-common/src/main/scala/org/apache/streampark/common/util/YarnUtils.scala
@@ -47,7 +47,7 @@ object YarnUtils extends Logger {
lazy val PROXY_YARN_URL =
InternalConfigHolder.get[String](CommonConfig.STREAMPARK_PROXY_YARN_URL)
/**
- * hadoop.http.authentication.type<br> get yarn http authentication
mode.<br> ex: sample, kerberos
+ * hadoop.http.authentication.type<br> get yarn http authentication
mode.<br> ex: simple, kerberos
*
* @return
*/
@@ -56,9 +56,9 @@ object YarnUtils extends Logger {
"kerberos".equalsIgnoreCase(yarnHttpAuth)
}
- lazy val hasYarnHttpSampleAuth: Boolean = {
+ lazy val hasYarnHttpSimpleAuth: Boolean = {
val yarnHttpAuth: String =
InternalConfigHolder.get[String](CommonConfig.STREAMPARK_YARN_AUTH)
- "sample".equalsIgnoreCase(yarnHttpAuth)
+ "simple".equalsIgnoreCase(yarnHttpAuth)
}
/**
@@ -289,7 +289,7 @@ object YarnUtils extends Logger {
})
} else {
val url =
- if (!hasYarnHttpSampleAuth) reqUrl
+ if (!hasYarnHttpSimpleAuth) reqUrl
else {
s"$reqUrl?user.name=${HadoopUtils.hadoopUserName}"
}
diff --git
a/streampark-console/streampark-console-service/src/main/resources/application.yml
b/streampark-console/streampark-console-service/src/main/resources/application.yml
index f6f56807f..60618778c 100644
---
a/streampark-console/streampark-console-service/src/main/resources/application.yml
+++
b/streampark-console/streampark-console-service/src/main/resources/application.yml
@@ -77,8 +77,8 @@ streampark:
# lark alert proxy,default https://open.feishu.cn
lark-url:
yarn:
- # default sample, or kerberos
- http-auth: sample
+ # default simple, or kerberos
+ http-auth: simple
# HADOOP_USER_NAME
hadoop-user-name: hdfs