This is an automated email from the ASF dual-hosted git repository.
guoweijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 7989f485f109d213dfc5a0dc2356d2a5dac16008
Author: Weijie Guo <res...@163.com>
AuthorDate: Thu Sep 12 18:01:39 2024 +0800
[FLINK-36257][K8S] Remove legacy k8s labels
---
.../kubeclient/resources/KubernetesLeaderElector.java | 5 +----
.../org/apache/flink/kubernetes/utils/KubernetesUtils.java | 10 ++--------
.../kubeclient/resources/KubernetesLeaderElectorITCase.java | 9 +--------
3 files changed, 4 insertions(+), 20 deletions(-)
diff --git
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesLeaderElector.java
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesLeaderElector.java
index 728f46abcb6..b15f382e05b 100644
---
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesLeaderElector.java
+++
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesLeaderElector.java
@@ -43,8 +43,6 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
-import static
org.apache.flink.kubernetes.utils.Constants.LABEL_CONFIGMAP_TYPE_HIGH_AVAILABILITY;
-
/**
* Represent {@link KubernetesLeaderElector} in kubernetes. {@link
LeaderElector#run()} is a
* blocking call. It should be run in the IO executor, not the main thread.
The lifecycle is bound
@@ -104,8 +102,7 @@ public class KubernetesLeaderElector {
// ConfigMaps.
.withLabels(
KubernetesUtils.getConfigMapLabels(
-
leaderConfig.getClusterId(),
-
LABEL_CONFIGMAP_TYPE_HIGH_AVAILABILITY))
+
leaderConfig.getClusterId()))
.build(),
leaderConfig.getLockIdentity()))
.withRenewDeadline(leaderConfig.getRenewDeadline())
diff --git
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java
index 09ff6653d7f..e9b1a2ecfb8 100644
---
a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java
+++
b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/utils/KubernetesUtils.java
@@ -88,7 +88,6 @@ import static
org.apache.flink.kubernetes.utils.Constants.COMPLETED_CHECKPOINT_F
import static org.apache.flink.kubernetes.utils.Constants.DNS_POLICY_DEFAULT;
import static
org.apache.flink.kubernetes.utils.Constants.DNS_POLICY_HOSTNETWORK;
import static
org.apache.flink.kubernetes.utils.Constants.JOB_GRAPH_STORE_KEY_PREFIX;
-import static
org.apache.flink.kubernetes.utils.Constants.LABEL_CONFIGMAP_TYPE_HIGH_AVAILABILITY;
import static org.apache.flink.kubernetes.utils.Constants.LEADER_ADDRESS_KEY;
import static
org.apache.flink.kubernetes.utils.Constants.LEADER_SESSION_ID_KEY;
import static
org.apache.flink.kubernetes.utils.Constants.SUBMITTED_JOBGRAPH_FILE_PREFIX;
@@ -192,13 +191,10 @@ public class KubernetesUtils {
* the resources.
*
* @param clusterId cluster id
- * @param type the config map use case. It could only be {@link
- * Constants#LABEL_CONFIGMAP_TYPE_HIGH_AVAILABILITY} now.
* @return Return ConfigMap labels.
*/
- public static Map<String, String> getConfigMapLabels(String clusterId,
String type) {
+ public static Map<String, String> getConfigMapLabels(String clusterId) {
final Map<String, String> labels = new
HashMap<>(getCommonLabels(clusterId));
- labels.put(Constants.LABEL_CONFIGMAP_TYPE_KEY, type);
return Collections.unmodifiableMap(labels);
}
@@ -561,9 +557,7 @@ public class KubernetesUtils {
new ConfigMapBuilder()
.withNewMetadata()
.withName(configMapName)
- .withLabels(
- getConfigMapLabels(
- clusterId,
LABEL_CONFIGMAP_TYPE_HIGH_AVAILABILITY))
+ .withLabels(getConfigMapLabels(clusterId))
.endMetadata()
.build());
diff --git
a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesLeaderElectorITCase.java
b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesLeaderElectorITCase.java
index d3a99ad5c39..d23e9d85674 100644
---
a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesLeaderElectorITCase.java
+++
b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/kubeclient/resources/KubernetesLeaderElectorITCase.java
@@ -36,8 +36,6 @@ import java.time.Duration;
import java.util.UUID;
import static org.apache.flink.core.testutils.FlinkAssertions.assertThatFuture;
-import static
org.apache.flink.kubernetes.utils.Constants.LABEL_CONFIGMAP_TYPE_HIGH_AVAILABILITY;
-import static
org.apache.flink.kubernetes.utils.Constants.LABEL_CONFIGMAP_TYPE_KEY;
import static org.assertj.core.api.Assertions.assertThat;
/**
@@ -153,12 +151,7 @@ class KubernetesLeaderElectorITCase {
assertThat(kubeClient.getConfigMap(configMapName))
.hasValueSatisfying(
- configMap ->
- assertThat(configMap.getLabels())
- .hasSize(3)
- .containsEntry(
-
LABEL_CONFIGMAP_TYPE_KEY,
-
LABEL_CONFIGMAP_TYPE_HIGH_AVAILABILITY));
+ configMap ->
assertThat(configMap.getLabels()).hasSize(2));
} finally {
leaderElector.stop();
}
