From 28469fc9b23094a74cbef83b9990d6fbced20d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AE=B6=E5=90=8D?= <13774486042@163.com>
Date: Wed, 7 Sep 2022 10:35:50 +0800
Subject: [PATCH] [bug][k8s] Change the config file keys in K8s to be the same
 as those in common.properties (#11812)

---
 .../kubernetes/dolphinscheduler/values.yaml   | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/deploy/kubernetes/dolphinscheduler/values.yaml b/deploy/kubernetes/dolphinscheduler/values.yaml
index 7fec3bef8e..16780e168a 100644
--- a/deploy/kubernetes/dolphinscheduler/values.yaml
+++ b/deploy/kubernetes/dolphinscheduler/values.yaml
@@ -74,8 +74,8 @@ conf:
     # resource storage type: HDFS, S3, NONE
     resource.storage.type: HDFS
 
-    # resource store on HDFS/S3 path, resource file will store to this hadoop hdfs path, self configuration, please make sure the directory exists on hdfs and have read write permissions. "/dolphinscheduler" is recommended
-    resource.upload.path: /dolphinscheduler
+    # resource store on HDFS/S3 path, resource file will store to this base path, self configuration, please make sure the directory exists on hdfs and have read write permissions. "/dolphinscheduler" is recommended
+    resource.storage.upload.base.path: /dolphinscheduler
 
     # whether to startup kerberos
     hadoop.security.authentication.startup.state: false
@@ -93,14 +93,20 @@ conf:
     kerberos.expire.time: 2
     # resource view suffixs
     #resource.view.suffixs: txt,log,sh,bat,conf,cfg,py,java,sql,xml,hql,properties,json,yml,yaml,ini,js
-    # if resource.storage.type: HDFS, the user must have the permission to create directories under the HDFS root path
-    hdfs.root.user: hdfs
-    # if resource.storage.type: S3, the value like: s3a://dolphinscheduler; if resource.storage.type: HDFS and namenode HA is enabled, you need to copy core-site.xml and hdfs-site.xml to conf dir
-    fs.defaultFS: file:///
-    aws.access.key.id: minioadmin
-    aws.secret.access.key: minioadmin
-    aws.region: us-east-1
-    aws.endpoint: http://localhost:9000
+    # if resource.storage.type=HDFS, the user must have the permission to create directories under the HDFS root path
+    resource.hdfs.root.user: hdfs
+    # if resource.storage.type=S3, the value like: s3a://dolphinscheduler; if resource.storage.type=HDFS and namenode HA is enabled, you need to copy core-site.xml and hdfs-site.xml to conf dir
+    resource.hdfs.fs.defaultFS: hdfs://mycluster:8020
+    # The AWS access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
+    resource.aws.access.key.id: minioadmin
+    # The AWS secret access key. if resource.storage.type=S3 or use EMR-Task, This configuration is required
+    resource.aws.secret.access.key: minioadmin
+    # The AWS Region to use. if resource.storage.type=S3 or use EMR-Task, This configuration is required
+    resource.aws.region: cn-north-1
+    # The name of the bucket. You need to create them by yourself. Otherwise, the system cannot start. All buckets in Amazon S3 share a single namespace; ensure the bucket is given a unique name.
+    resource.aws.s3.bucket.name: dolphinscheduler
+    # You need to set this parameter when private cloud s3. If S3 uses public cloud, you only need to set resource.aws.region or set to the endpoint of a public cloud such as S3.cn-north-1.amazonaws.com.cn
+    resource.aws.s3.endpoint: http://localhost:9000
     # resourcemanager port, the default value is 8088 if not specified
     resource.manager.httpaddress.port: 8088
     # if resourcemanager HA is enabled, please set the HA IPs; if resourcemanager is single, keep this value empty