(flink) 01/06: [hotfix][test] Moves ConfigMap lifecycle management into @BeforeEach/@AfterEach methods

[mapohl]

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

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

commit e5d488c9e5b12b1bd16ceeb4f44fe0526777b802
Author: Matthias Pohl <matthias.p...@aiven.io>
AuthorDate: Fri Jan 26 11:25:34 2024 +0100

    [hotfix][test] Moves ConfigMap lifecycle management into 
@BeforeEach/@AfterEach methods
---
 .../resources/KubernetesLeaderElectorITCase.java   | 24 +++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

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 e97d23c6d54..a86008f693a 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
@@ -24,6 +24,8 @@ import 
org.apache.flink.kubernetes.configuration.KubernetesLeaderElectionConfigu
 import org.apache.flink.kubernetes.kubeclient.FlinkKubeClient;
 import org.apache.flink.kubernetes.kubeclient.FlinkKubeClientFactory;
 
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
@@ -41,14 +43,27 @@ class KubernetesLeaderElectorITCase {
 
     private final FlinkKubeClientFactory kubeClientFactory = new 
FlinkKubeClientFactory();
 
-    private static final String LEADER_CONFIGMAP_NAME_PREFIX = 
"leader-test-cluster";
+    private String configMapName;
+
+    @BeforeEach
+    void initializeConfigMapName() {
+        this.configMapName =
+                String.format(
+                        "%s-configmap-%s",
+                        // needs to comply to RFC-1123
+                        
KubernetesLeaderElectorITCase.class.getSimpleName().toLowerCase(),
+                        UUID.randomUUID());
+    }
+
+    @AfterEach
+    void deleteConfigMapName() {
+        
kubernetesExtension.getFlinkKubeClient().deleteConfigMap(this.configMapName).join();
+    }
 
     @Test
     void testMultipleKubernetesLeaderElectors() throws Exception {
         final Configuration configuration = 
kubernetesExtension.getConfiguration();
 
-        final String leaderConfigMapName =
-                LEADER_CONFIGMAP_NAME_PREFIX + System.currentTimeMillis();
         final int leaderNum = 3;
 
         final KubernetesLeaderElector[] leaderElectors = new 
KubernetesLeaderElector[leaderNum];
@@ -64,7 +79,7 @@ class KubernetesLeaderElectorITCase {
                         new 
TestingLeaderCallbackHandler(UUID.randomUUID().toString());
                 final KubernetesLeaderElectionConfiguration leaderConfig =
                         new KubernetesLeaderElectionConfiguration(
-                                leaderConfigMapName,
+                                configMapName,
                                 leaderCallbackHandlers[i].getLockIdentity(),
                                 configuration);
                 leaderElectors[i] =
@@ -107,7 +122,6 @@ class KubernetesLeaderElectorITCase {
                     kubeClients[i].close();
                 }
             }
-            
kubernetesExtension.getFlinkKubeClient().deleteConfigMap(leaderConfigMapName).get();
         }
     }
 }