[incubator-streampark] branch dev updated: [Bug] The incorrect for loop writing method resulted in the same values for the three podTemplates in k8s mode. (#3144)

[benjobs]

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 d8c071422 [Bug] The incorrect for loop writing method resulted in the 
same values for the three podTemplates in k8s mode. (#3144)
d8c071422 is described below

commit d8c071422a8d9ddd12da62fdc5faa69b5884aa2f
Author: wangkeshuai1 <129287211+wangkeshu...@users.noreply.github.com>
AuthorDate: Wed Sep 20 11:32:15 2023 +0800

    [Bug] The incorrect for loop writing method resulted in the same values for 
the three podTemplates in k8s mode. (#3144)
    
    Co-authored-by: 王可帅 <os.wang...@ffcs.cn>
---
 .../flink/client/trait/KubernetesNativeClientTrait.scala     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git 
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/KubernetesNativeClientTrait.scala
 
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/KubernetesNativeClientTrait.scala
index 8ca6c518f..310d42a14 100644
--- 
a/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/KubernetesNativeClientTrait.scala
+++ 
b/streampark-flink/streampark-flink-client/streampark-flink-client-core/src/main/scala/org/apache/streampark/flink/client/trait/KubernetesNativeClientTrait.scala
@@ -19,6 +19,7 @@ package org.apache.streampark.flink.client.`trait`
 
 import org.apache.streampark.common.enums.{ExecutionMode, 
FlinkK8sRestExposedType}
 import org.apache.streampark.flink.client.bean._
+import org.apache.streampark.flink.kubernetes.PodTemplateTool
 import org.apache.streampark.flink.packer.pipeline.DockerImageBuildResponse
 
 import org.apache.commons.lang3.StringUtils
@@ -51,10 +52,13 @@ trait KubernetesNativeClientTrait extends FlinkClientTrait {
         val buildResult = 
submitRequest.buildResult.asInstanceOf[DockerImageBuildResponse]
         buildResult.podTemplatePaths.foreach(
           p => {
-            flinkConfig
-              .safeSet(KubernetesConfigOptions.KUBERNETES_POD_TEMPLATE, p._2)
-              .safeSet(KubernetesConfigOptions.JOB_MANAGER_POD_TEMPLATE, p._2)
-              .safeSet(KubernetesConfigOptions.TASK_MANAGER_POD_TEMPLATE, p._2)
+            if (PodTemplateTool.KUBERNETES_POD_TEMPLATE.key.equals(p._1)) {
+              
flinkConfig.safeSet(KubernetesConfigOptions.KUBERNETES_POD_TEMPLATE, p._2)
+            } else if 
(PodTemplateTool.KUBERNETES_JM_POD_TEMPLATE.key.equals(p._1)) {
+              
flinkConfig.safeSet(KubernetesConfigOptions.JOB_MANAGER_POD_TEMPLATE, p._2)
+            } else if 
(PodTemplateTool.KUBERNETES_TM_POD_TEMPLATE.key.equals(p._1)) {
+              
flinkConfig.safeSet(KubernetesConfigOptions.TASK_MANAGER_POD_TEMPLATE, p._2)
+            }
           })
       }
     }