From ca7843ef62d23fc2f8590b4d785f9bf67723bf4d Mon Sep 17 00:00:00 2001 From: Wink <809097465@qq.com> Date: Sat, 8 Mar 2025 16:42:02 +0800 Subject: [PATCH 1/2] [bug][dinky-gateway] Fix the issue where two Flink configuration items with the same prefix cause errors in Flink configuration parsing (#4286) Co-authored-by: zhangyuhang <2827528315@qq.com> Co-authored-by: yuhang2.zhang --- .../gateway/kubernetes/KubernetesGateway.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) 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 index 5413200847..947060dfc9 100644 --- a/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesGateway.java +++ b/dinky-gateway/src/main/java/org/dinky/gateway/kubernetes/KubernetesGateway.java @@ -47,6 +47,7 @@ import java.lang.reflect.Method; import java.util.Collections; +import java.util.Map; import java.util.UUID; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -102,17 +103,6 @@ protected void initConfig() { + " is not Valid. In Kubernetes mode, task names must start and end with a lowercase letter or a digit, " + "and can contain lowercase letters, digits, dots, and hyphens in between."); } - k8sConfig = config.getKubernetesConfig(); - - // Be compatible with kubernetes.container.image and kubernetes.container.image.ref - final String oldContainerImageKey = "kubernetes.container.image"; - if (k8sConfig.getConfiguration().containsKey(oldContainerImageKey)) { - k8sConfig - .getConfiguration() - .put( - KubernetesConfigOptions.CONTAINER_IMAGE.key(), - k8sConfig.getConfiguration().get(oldContainerImageKey)); - } configuration.set(CoreOptions.CLASSLOADER_RESOLVE_ORDER, "parent-first"); try { @@ -122,8 +112,17 @@ protected void initConfig() { logger.warn("load locale config yaml failed：{},Skip config it", e.getMessage()); } + k8sConfig = config.getKubernetesConfig(); + // 兼容kubernetes.container.image 和 kubernetes.container.image.ref + Map k8sConfiguration = k8sConfig.getConfiguration(); + final String oldContainerImageKey = "kubernetes.container.image"; + if (k8sConfiguration.containsKey(oldContainerImageKey)) { + String containerImageValue = k8sConfiguration.get(oldContainerImageKey); + k8sConfiguration.remove(oldContainerImageKey); + k8sConfiguration.put(KubernetesConfigOptions.CONTAINER_IMAGE.key(), containerImageValue); + } // -------------------Note: the sequence can not be changed, priority problem---------------- - addConfigParas(k8sConfig.getConfiguration()); + addConfigParas(k8sConfiguration); addConfigParas(flinkConfig.getConfiguration()); // ------------------------------------------- addConfigParas(DeploymentOptions.TARGET, getType().getLongValue()); From 0fa4db5339b3e28e5d3e4916e5fc95aa37f0a780 Mon Sep 17 00:00:00 2001 From: zhangyuhang <2827528315@qq.com> Date: Fri, 14 Mar 2025 09:09:57 +0800 Subject: [PATCH 2/2] [bug][dinky-gateway] Fix the issue where two Flink configuration items with the same prefix cause errors in Flink configuration parsing. (#4298) Co-authored-by: yuhang2.zhang --- .../kubeclient/decorators/FlinkConfMountDecorator.java | 2 +- .../kubeclient/decorators/FlinkConfMountDecorator.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dinky-client/dinky-client-1.19/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java b/dinky-client/dinky-client-1.19/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java index 15c80c8569..c040c5e9b4 100644 --- a/dinky-client/dinky-client-1.19/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java +++ b/dinky-client/dinky-client-1.19/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java @@ -154,7 +154,7 @@ private List getClusterSideConfData(Configuration flinkConfig) { clusterSideConfig.removeConfig(JobManagerOptions.BIND_HOST); clusterSideConfig.removeConfig(TaskManagerOptions.BIND_HOST); clusterSideConfig.removeConfig(TaskManagerOptions.HOST); - return ConfigurationUtils.convertConfigToWritableLines(clusterSideConfig, false); + return ConfigurationUtils.convertConfigToWritableLines(clusterSideConfig, true); } @VisibleForTesting diff --git a/dinky-client/dinky-client-1.20/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java b/dinky-client/dinky-client-1.20/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java index 15c80c8569..c040c5e9b4 100644 --- a/dinky-client/dinky-client-1.20/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java +++ b/dinky-client/dinky-client-1.20/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java @@ -154,7 +154,7 @@ private List getClusterSideConfData(Configuration flinkConfig) { clusterSideConfig.removeConfig(JobManagerOptions.BIND_HOST); clusterSideConfig.removeConfig(TaskManagerOptions.BIND_HOST); clusterSideConfig.removeConfig(TaskManagerOptions.HOST); - return ConfigurationUtils.convertConfigToWritableLines(clusterSideConfig, false); + return ConfigurationUtils.convertConfigToWritableLines(clusterSideConfig, true); } @VisibleForTesting