You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ma...@apache.org on 2023/06/20 15:22:44 UTC

[flink] 01/02: [hotfix][runtime] Removes unused driver

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

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

commit 02629a8428f4815197c4f995ff53a884bd515081
Author: Matthias Pohl <ma...@aiven.io>
AuthorDate: Thu May 25 16:56:53 2023 +0200

    [hotfix][runtime] Removes unused driver
    
    Signed-off-by: Matthias Pohl <ma...@aiven.io>
---
 .../KubernetesMultipleComponentLeaderElectionHaServices.java         | 1 -
 .../KubernetesMultipleComponentLeaderRetrievalDriverFactory.java     | 5 -----
 .../KubernetesMultipleComponentLeaderElectionDriverTest.java         | 1 -
 3 files changed, 7 deletions(-)

diff --git a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionHaServices.java b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionHaServices.java
index 9092bf1eac5..9a77040a125 100644
--- a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionHaServices.java
+++ b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionHaServices.java
@@ -143,7 +143,6 @@ public class KubernetesMultipleComponentLeaderElectionHaServices extends Abstrac
     protected LeaderRetrievalService createLeaderRetrievalService(String componentId) {
         return new DefaultLeaderRetrievalService(
                 new KubernetesMultipleComponentLeaderRetrievalDriverFactory(
-                        kubeClient,
                         configMapSharedWatcher,
                         watchExecutorService,
                         getClusterConfigMap(),
diff --git a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderRetrievalDriverFactory.java b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderRetrievalDriverFactory.java
index 44aaf7210e8..ae72f9c5a3c 100644
--- a/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderRetrievalDriverFactory.java
+++ b/flink-kubernetes/src/main/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderRetrievalDriverFactory.java
@@ -18,7 +18,6 @@
 
 package org.apache.flink.kubernetes.highavailability;
 
-import org.apache.flink.kubernetes.kubeclient.FlinkKubeClient;
 import org.apache.flink.kubernetes.kubeclient.KubernetesConfigMapSharedWatcher;
 import org.apache.flink.kubernetes.kubeclient.resources.KubernetesConfigMap;
 import org.apache.flink.kubernetes.utils.KubernetesUtils;
@@ -39,8 +38,6 @@ import java.util.concurrent.Executor;
 public class KubernetesMultipleComponentLeaderRetrievalDriverFactory
         implements LeaderRetrievalDriverFactory {
 
-    private final FlinkKubeClient kubeClient;
-
     private final KubernetesConfigMapSharedWatcher configMapSharedWatcher;
 
     private final Executor watchExecutor;
@@ -50,12 +47,10 @@ public class KubernetesMultipleComponentLeaderRetrievalDriverFactory
     private final String componentId;
 
     public KubernetesMultipleComponentLeaderRetrievalDriverFactory(
-            FlinkKubeClient kubeClient,
             KubernetesConfigMapSharedWatcher configMapSharedWatcher,
             Executor watchExecutor,
             String configMapName,
             String componentId) {
-        this.kubeClient = Preconditions.checkNotNull(kubeClient);
         this.configMapSharedWatcher = Preconditions.checkNotNull(configMapSharedWatcher);
         this.watchExecutor = Preconditions.checkNotNull(watchExecutor);
         this.configMapName = Preconditions.checkNotNull(configMapName);
diff --git a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionDriverTest.java b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionDriverTest.java
index a03c5c3b5ef..3f2edb8f658 100644
--- a/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionDriverTest.java
+++ b/flink-kubernetes/src/test/java/org/apache/flink/kubernetes/highavailability/KubernetesMultipleComponentLeaderElectionDriverTest.java
@@ -101,7 +101,6 @@ class KubernetesMultipleComponentLeaderElectionDriverTest {
                             final DefaultLeaderRetrievalService leaderRetrievalService =
                                     new DefaultLeaderRetrievalService(
                                             new KubernetesMultipleComponentLeaderRetrievalDriverFactory(
-                                                    getFlinkKubeClient(),
                                                     getConfigMapSharedWatcher(),
                                                     testExecutorExtension.getExecutor(),
                                                     LEADER_CONFIGMAP_NAME,