Merge branch 'dev' of https://github.com/DataLinkDC/dinky into dev

DataLinkDC · Jun 1, 2024 · 7defb23 · 7defb23
2 parents ce51e1b + 295eb6c
commit 7defb23
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesGateway.java b/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesGateway.java
@@ -93,8 +93,10 @@ protected void initConfig() {
             logger.warn("load locale config yaml failed：{},Skip config it", e.getMessage());
         }
 
-        addConfigParas(flinkConfig.getConfiguration());
+        // -------------------Note: the sequence can not be changed, priority problem----------------
         addConfigParas(k8sConfig.getConfiguration());
+        addConfigParas(flinkConfig.getConfiguration());
+        // -------------------------------------------
         addConfigParas(DeploymentOptions.TARGET, getType().getLongValue());
         addConfigParas(KubernetesConfigOptions.CLUSTER_ID, flinkConfig.getJobName());
         addConfigParas(