wip

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/IngressUtils.java

@@ -48,6 +48,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -102,7 +103,10 @@ private static HasMetadata getIngress(
             FlinkDeploymentSpec spec,
             Configuration effectiveConfig,
             KubernetesClient client) {
-        var labels = new HashMap<>(spec.getIngress().getLabels());
+        Map<String, String> labels =
+                spec.getIngress().getLabels() == null
+                        ? new HashMap<>()
+                        : new HashMap<>(spec.getIngress().getLabels());
         labels.put(Constants.LABEL_COMPONENT_KEY, LABEL_COMPONENT_INGRESS);
         if (ingressInNetworkingV1(client)) {
             return new IngressBuilder()

flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/FlinkOperatorTest.java

@@ -21,12 +21,12 @@
 import org.apache.flink.configuration.IllegalConfigurationException;
 import org.apache.flink.kubernetes.operator.config.KubernetesOperatorConfigOptions;
 
+import io.fabric8.kubeapitest.junit.EnableKubeAPIServer;
 import io.fabric8.kubernetes.client.Config;
 import io.javaoperatorsdk.operator.RegisteredController;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.processing.event.rate.LinearRateLimiter;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import java.util.concurrent.ThreadPoolExecutor;
@@ -39,14 +39,11 @@
  *     ConfigurationServiceProvider) we write multiple tests as a single function, please provide
  *     ample comments.
  */
-public class FlinkOperatorTest {
-    @BeforeAll
-    public static void setAutoTryKubeConfig() {
-        System.setProperty(Config.KUBERNETES_AUTH_TRYKUBECONFIG_SYSTEM_PROPERTY, "false");
-    }
+@EnableKubeAPIServer(updateKubeConfigFile = true)
+class FlinkOperatorTest {
 
     @Test
-    public void testConfigurationPassedToJOSDK() {
+    void testConfigurationPassedToJOSDK() {
         var testParallelism = 42;
         var testSelector = "flink=enabled";
         var testLeaseName = "test-lease";
@@ -99,7 +96,7 @@ public void testConfigurationPassedToJOSDK() {
     }
 
     @Test
-    public void testLeaderElectionConfig() {
+    void testLeaderElectionConfig() {
         var operatorConfig = new Configuration();
         operatorConfig.set(KubernetesOperatorConfigOptions.OPERATOR_LEADER_ELECTION_ENABLED, true);
 

flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FlinkDeploymentControllerTest.java

@@ -934,6 +934,7 @@ public void cleanUpNewDeployment() {
         assertTrue(testController.getContextFactory().getMetricGroups().isEmpty());
     }
 
+    // todo add test here
     @Test
     public void testIngressLifeCycle() throws Exception {
         FlinkDeployment appNoIngress = TestUtils.buildApplicationCluster();