You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by gy...@apache.org on 2024/10/13 11:04:34 UTC

(flink-kubernetes-operator) branch main updated: [FLINK-36264] Fix can not setup other values for parameter `rest-service.exposed.type`

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

gyfora pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git


The following commit(s) were added to refs/heads/main by this push:
     new 4d5b2c9a [FLINK-36264] Fix can not setup other values for parameter `rest-service.exposed.type`
4d5b2c9a is described below

commit 4d5b2c9a0bd470c03a20a777b2e1e1c858b783f7
Author: chenyuzhi459 <55...@qq.com>
AuthorDate: Sun Oct 13 19:04:29 2024 +0800

    [FLINK-36264] Fix can not setup other values for parameter `rest-service.exposed.type`
---
 .../operator/config/FlinkConfigBuilder.java         | 11 -----------
 .../operator/config/FlinkConfigBuilderTest.java     | 21 ++++++++++-----------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilder.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilder.java
index 905ae7d0..3c3ad889 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilder.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilder.java
@@ -249,16 +249,6 @@ public class FlinkConfigBuilder {
         return this;
     }
 
-    protected FlinkConfigBuilder applyIngressDomain() {
-        // Web UI
-        if (spec.getIngress() != null) {
-            effectiveConfig.set(
-                    REST_SERVICE_EXPOSED_TYPE,
-                    KubernetesConfigOptions.ServiceExposedType.ClusterIP);
-        }
-        return this;
-    }
-
     protected FlinkConfigBuilder applyServiceAccount() {
         if (spec.getServiceAccount() != null) {
             effectiveConfig.set(
@@ -412,7 +402,6 @@ public class FlinkConfigBuilder {
                 .applyImagePullPolicy()
                 .applyServiceAccount()
                 .applyPodTemplate()
-                .applyIngressDomain()
                 .applyJobManagerSpec()
                 .applyTaskManagerSpec()
                 .applyJobOrSessionSpec()
diff --git a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilderTest.java b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilderTest.java
index 4ba1367d..4b07e335 100644
--- a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilderTest.java
+++ b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/config/FlinkConfigBuilderTest.java
@@ -63,6 +63,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import static org.apache.flink.configuration.DeploymentOptions.SHUTDOWN_ON_APPLICATION_FINISH;
 import static org.apache.flink.kubernetes.operator.api.utils.BaseTestUtils.IMAGE;
@@ -348,17 +349,6 @@ public class FlinkConfigBuilderTest {
                 PodTemplateSpec.class);
     }
 
-    @Test
-    public void testApplyIngressDomain() {
-        final Configuration configuration =
-                new FlinkConfigBuilder(flinkDeployment, new Configuration())
-                        .applyIngressDomain()
-                        .build();
-        assertEquals(
-                KubernetesConfigOptions.ServiceExposedType.ClusterIP,
-                configuration.get(KubernetesConfigOptions.REST_SERVICE_EXPOSED_TYPE));
-    }
-
     @Test
     public void testApplyServiceAccount() {
         final Configuration configuration =
@@ -944,4 +934,13 @@ public class FlinkConfigBuilderTest {
                 TestUtils.getTestPodTemplate("hostname", List.of(mainContainer, sideCarContainer));
         return pod;
     }
+
+    private static Stream<KubernetesConfigOptions.ServiceExposedType> serviceExposedTypes() {
+        return Stream.of(
+                null,
+                KubernetesConfigOptions.ServiceExposedType.ClusterIP,
+                KubernetesConfigOptions.ServiceExposedType.LoadBalancer,
+                KubernetesConfigOptions.ServiceExposedType.Headless_ClusterIP,
+                KubernetesConfigOptions.ServiceExposedType.NodePort);
+    }
 }