This is an automated email from the ASF dual-hosted git repository.
RocMarshal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 7d3b99217d2 [FLINK-40816][kubernetes/configuration] Remove the
deprecated configuration keys from the flink-kubernetes module.
7d3b99217d2 is described below
commit 7d3b99217d292ad291968e32620da55eaffa29a3
Author: Yuepeng Pan <[email protected]>
AuthorDate: Fri Sep 25 16:45:45 2026 +0800
[FLINK-40816][kubernetes/configuration] Remove the deprecated configuration
keys from the flink-kubernetes module.
---
.../test-scripts/test_kubernetes_application.sh | 4 ++--
.../test-scripts/test_kubernetes_application_ha.sh | 4 ++--
.../test-scripts/test_kubernetes_materialized_table.sh | 4 ++--
.../test-scripts/test_kubernetes_pyflink_application.sh | 4 ++--
flink-end-to-end-tests/test-scripts/test_kubernetes_session.sh | 4 ++--
.../test-scripts/test_kubernetes_sql_application.sh | 4 ++--
.../flink/kubernetes/configuration/KubernetesConfigOptions.java | 8 +-------
7 files changed, 13 insertions(+), 19 deletions(-)
diff --git a/flink-end-to-end-tests/test-scripts/test_kubernetes_application.sh
b/flink-end-to-end-tests/test-scripts/test_kubernetes_application.sh
index 6ba5eca844c..c50747058a1 100755
--- a/flink-end-to-end-tests/test-scripts/test_kubernetes_application.sh
+++ b/flink-end-to-end-tests/test-scripts/test_kubernetes_application.sh
@@ -47,8 +47,8 @@ mkdir -p "$LOCAL_LOGS_PATH"
-Dkubernetes.cluster-id=${CLUSTER_ID} \
-Dkubernetes.container.image.ref=${FLINK_IMAGE_NAME} \
-Djobmanager.memory.process.size=1088m \
- -Dkubernetes.jobmanager.cpu=0.5 \
- -Dkubernetes.taskmanager.cpu=0.5 \
+ -Dkubernetes.jobmanager.cpu.amount=0.5 \
+ -Dkubernetes.taskmanager.cpu.amount=0.5 \
-Dkubernetes.rest-service.exposed.type=NodePort \
local:///opt/flink/examples/streaming/WordCount.jar
diff --git
a/flink-end-to-end-tests/test-scripts/test_kubernetes_application_ha.sh
b/flink-end-to-end-tests/test-scripts/test_kubernetes_application_ha.sh
index f4551d62c8b..02a9d1f5edc 100755
--- a/flink-end-to-end-tests/test-scripts/test_kubernetes_application_ha.sh
+++ b/flink-end-to-end-tests/test-scripts/test_kubernetes_application_ha.sh
@@ -53,8 +53,8 @@ mkdir -p "$LOCAL_LOGS_PATH"
-Dkubernetes.cluster-id=${CLUSTER_ID} \
-Dkubernetes.container.image.ref=${FLINK_IMAGE_NAME} \
-Djobmanager.memory.process.size=1088m \
- -Dkubernetes.jobmanager.cpu=0.5 \
- -Dkubernetes.taskmanager.cpu=0.5 \
+ -Dkubernetes.jobmanager.cpu.amount=0.5 \
+ -Dkubernetes.taskmanager.cpu.amount=0.5 \
-Dkubernetes.rest-service.exposed.type=NodePort \
-Dkubernetes.pod-template-file.default=${CONTAINER_SCRIPTS}/kubernetes-pod-template.yaml
\
-Dhigh-availability.type=org.apache.flink.kubernetes.highavailability.KubernetesHaServicesFactory
\
diff --git
a/flink-end-to-end-tests/test-scripts/test_kubernetes_materialized_table.sh
b/flink-end-to-end-tests/test-scripts/test_kubernetes_materialized_table.sh
index cb810a6c86c..9499d5fa7fa 100755
--- a/flink-end-to-end-tests/test-scripts/test_kubernetes_materialized_table.sh
+++ b/flink-end-to-end-tests/test-scripts/test_kubernetes_materialized_table.sh
@@ -192,8 +192,8 @@ session_options="{\"table.catalog-store.kind\": \"file\",
\"kubernetes.container.image.ref\": \"${FLINK_IMAGE_NAME}\",
\"jobmanager.memory.process.size\": \"1088m\",
\"taskmanager.memory.process.size\": \"1000m\",
- \"kubernetes.jobmanager.cpu\": \"0.5\",
- \"kubernetes.taskmanager.cpu\": \"0.5\",
+ \"kubernetes.jobmanager.cpu.amount\": \"0.5\",
+ \"kubernetes.taskmanager.cpu.amount\": \"0.5\",
\"kubernetes.rest-service.exposed.type\": \"NodePort\",
\"s3.endpoint\": \"$S3_ENDPOINT\",
\"workflow-scheduler.type\": \"embedded\"}"
diff --git
a/flink-end-to-end-tests/test-scripts/test_kubernetes_pyflink_application.sh
b/flink-end-to-end-tests/test-scripts/test_kubernetes_pyflink_application.sh
index da93a77c71f..e598175e546 100755
--- a/flink-end-to-end-tests/test-scripts/test_kubernetes_pyflink_application.sh
+++ b/flink-end-to-end-tests/test-scripts/test_kubernetes_pyflink_application.sh
@@ -105,8 +105,8 @@ mkdir -p "$LOCAL_LOGS_PATH"
-Dkubernetes.cluster-id=${CLUSTER_ID} \
-Dkubernetes.container.image.ref=${PYFLINK_IMAGE_NAME} \
-Djobmanager.memory.process.size=1088m \
- -Dkubernetes.jobmanager.cpu=0.5 \
- -Dkubernetes.taskmanager.cpu=0.5 \
+ -Dkubernetes.jobmanager.cpu.amount=0.5 \
+ -Dkubernetes.taskmanager.cpu.amount=0.5 \
-Dkubernetes.rest-service.exposed.type=NodePort \
-pym word_count -pyfs /opt/flink/examples/python/table
diff --git a/flink-end-to-end-tests/test-scripts/test_kubernetes_session.sh
b/flink-end-to-end-tests/test-scripts/test_kubernetes_session.sh
index 75fe46c12ee..6c000a8c72c 100755
--- a/flink-end-to-end-tests/test-scripts/test_kubernetes_session.sh
+++ b/flink-end-to-end-tests/test-scripts/test_kubernetes_session.sh
@@ -72,8 +72,8 @@ mkdir -p "$(dirname $LOCAL_OUTPUT_PATH)"
"$FLINK_DIR"/bin/kubernetes-session.sh -Dkubernetes.cluster-id=${CLUSTER_ID} \
-Dkubernetes.container.image.ref=${FLINK_IMAGE_NAME} \
-Djobmanager.memory.process.size=1088m \
- -Dkubernetes.jobmanager.cpu=0.5 \
- -Dkubernetes.taskmanager.cpu=0.5 \
+ -Dkubernetes.jobmanager.cpu.amount=0.5 \
+ -Dkubernetes.taskmanager.cpu.amount=0.5 \
-Dkubernetes.rest-service.exposed.type=NodePort \
$ENABLE_DUMMPY_FS_ARGS
diff --git
a/flink-end-to-end-tests/test-scripts/test_kubernetes_sql_application.sh
b/flink-end-to-end-tests/test-scripts/test_kubernetes_sql_application.sh
index e109c9ffc84..9eb784f517a 100755
--- a/flink-end-to-end-tests/test-scripts/test_kubernetes_sql_application.sh
+++ b/flink-end-to-end-tests/test-scripts/test_kubernetes_sql_application.sh
@@ -59,8 +59,8 @@ curl --location --request POST
http://localhost:8083/sessions/${SESSION_HANDLE}/
"kubernetes.container.image.ref": "'${FLINK_IMAGE_NAME}'",
"jobmanager.memory.process.size": "1088m",
"taskmanager.memory.process.size": "1000m",
- "kubernetes.jobmanager.cpu": 0.5,
- "kubernetes.taskmanager.cpu": 0.5,
+ "kubernetes.jobmanager.cpu.amount": 0.5,
+ "kubernetes.taskmanager.cpu.amount": 0.5,
"kubernetes.rest-service.exposed.type": "NodePort"
}
}'
diff --git
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/configuration/KubernetesConfigOptions.java
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/configuration/KubernetesConfigOptions.java
index bac5cced799..3bdb95ff820 100644
---
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/configuration/KubernetesConfigOptions.java
+++
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/configuration/KubernetesConfigOptions.java
@@ -147,7 +147,6 @@ public class KubernetesConfigOptions {
key("kubernetes.jobmanager.cpu.amount")
.doubleType()
.defaultValue(1.0)
- .withDeprecatedKeys("kubernetes.jobmanager.cpu")
.withDescription("The number of cpu used by job manager");
public static final ConfigOption<Double> JOB_MANAGER_CPU_LIMIT_FACTOR =
@@ -170,7 +169,6 @@ public class KubernetesConfigOptions {
key("kubernetes.taskmanager.cpu.amount")
.doubleType()
.defaultValue(-1.0)
- .withDeprecatedKeys("kubernetes.taskmanager.cpu")
.withDescription(
"The number of cpu used by task manager. By
default, the cpu is set "
+ "to the number of slots per
TaskManager");
@@ -275,7 +273,6 @@ public class KubernetesConfigOptions {
key("kubernetes.container.image.ref")
.stringType()
.defaultValue(getDefaultFlinkImage())
- .withDeprecatedKeys("kubernetes.container.image")
.withDescription(
Description.builder()
.text(
@@ -725,10 +722,7 @@ public class KubernetesConfigOptions {
static {
final ConfigOption<String> defaultPodTemplate =
- key(KUBERNETES_POD_TEMPLATE_FILE_KEY + ".default")
- .stringType()
- .noDefaultValue()
- .withDeprecatedKeys(KUBERNETES_POD_TEMPLATE_FILE_KEY);
+ key(KUBERNETES_POD_TEMPLATE_FILE_KEY +
".default").stringType().noDefaultValue();
JOB_MANAGER_POD_TEMPLATE =
key(KUBERNETES_POD_TEMPLATE_FILE_KEY + ".jobmanager")
