(flink-cdc) branch master updated: [hotfix][k8s] Fix command-line option `from-savepoint` does not work in K8s deployment mode

[leonard]

This is an automated email from the ASF dual-hosted git repository.

leonard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-cdc.git


The following commit(s) were added to refs/heads/master by this push:
     new ddc645b7c [hotfix][k8s] Fix command-line option `from-savepoint` does 
not work in K8s deployment mode
ddc645b7c is described below

commit ddc645b7cbc88bc2e26565e1d55f1f3121f7073c
Author: hiliuxg <39675622+hili...@users.noreply.github.com>
AuthorDate: Wed Jan 8 14:34:26 2025 +0800

    [hotfix][k8s] Fix command-line option `from-savepoint` does not work in K8s 
deployment mode
    
    This closes  #3825.
    
    Co-authored-by: helloli...@gmail.com <xiaogen...@kugou.net>
---
 .../src/main/java/org/apache/flink/cdc/cli/CliExecutor.java       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/CliExecutor.java 
b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/CliExecutor.java
index 2452ab59e..50107da11 100644
--- a/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/CliExecutor.java
+++ b/flink-cdc-cli/src/main/java/org/apache/flink/cdc/cli/CliExecutor.java
@@ -74,10 +74,10 @@ public class CliExecutor {
             ComposeDeploymentFactory composeDeploymentFactory = new 
ComposeDeploymentFactory();
             PipelineDeploymentExecutor composeExecutor =
                     
composeDeploymentFactory.getFlinkComposeExecutor(commandLine);
-            return composeExecutor.deploy(
-                    commandLine,
-                    
org.apache.flink.configuration.Configuration.fromMap(flinkConfig.toMap()),
-                    additionalJars);
+            org.apache.flink.configuration.Configuration configuration =
+                    
org.apache.flink.configuration.Configuration.fromMap(flinkConfig.toMap());
+            SavepointRestoreSettings.toConfiguration(savepointSettings, 
configuration);
+            return composeExecutor.deploy(commandLine, configuration, 
additionalJars);
         } else {
             // Run CDC Job And Parse pipeline definition file
             PipelineDefinitionParser pipelineDefinitionParser = new 
YamlPipelineDefinitionParser();