File tree 2 files changed +10
-22
lines changed
flink-kubernetes-operator/src
main/java/org/apache/flink/kubernetes/operator/config
test/java/org/apache/flink/kubernetes/operator/config
2 files changed +10
-22
lines changed Original file line number Diff line number Diff line change @@ -249,16 +249,6 @@ protected FlinkConfigBuilder applyPodTemplate() throws IOException {
249
249
return this ;
250
250
}
251
251
252
- protected FlinkConfigBuilder applyIngressDomain () {
253
- // Web UI
254
- if (spec .getIngress () != null ) {
255
- effectiveConfig .set (
256
- REST_SERVICE_EXPOSED_TYPE ,
257
- KubernetesConfigOptions .ServiceExposedType .ClusterIP );
258
- }
259
- return this ;
260
- }
261
-
262
252
protected FlinkConfigBuilder applyServiceAccount () {
263
253
if (spec .getServiceAccount () != null ) {
264
254
effectiveConfig .set (
@@ -412,7 +402,6 @@ public static Configuration buildFrom(
412
402
.applyImagePullPolicy ()
413
403
.applyServiceAccount ()
414
404
.applyPodTemplate ()
415
- .applyIngressDomain ()
416
405
.applyJobManagerSpec ()
417
406
.applyTaskManagerSpec ()
418
407
.applyJobOrSessionSpec ()
Original file line number Diff line number Diff line change 63
63
import java .util .Collections ;
64
64
import java .util .List ;
65
65
import java .util .Map ;
66
+ import java .util .stream .Stream ;
66
67
67
68
import static org .apache .flink .configuration .DeploymentOptions .SHUTDOWN_ON_APPLICATION_FINISH ;
68
69
import static org .apache .flink .kubernetes .operator .api .utils .BaseTestUtils .IMAGE ;
@@ -348,17 +349,6 @@ private PodTemplateSpec getTmPod(Configuration configuration) throws IOException
348
349
PodTemplateSpec .class );
349
350
}
350
351
351
- @ Test
352
- public void testApplyIngressDomain () {
353
- final Configuration configuration =
354
- new FlinkConfigBuilder (flinkDeployment , new Configuration ())
355
- .applyIngressDomain ()
356
- .build ();
357
- assertEquals (
358
- KubernetesConfigOptions .ServiceExposedType .ClusterIP ,
359
- configuration .get (KubernetesConfigOptions .REST_SERVICE_EXPOSED_TYPE ));
360
- }
361
-
362
352
@ Test
363
353
public void testApplyServiceAccount () {
364
354
final Configuration configuration =
@@ -944,4 +934,13 @@ private PodTemplateSpec createTestPodWithContainers() {
944
934
TestUtils .getTestPodTemplate ("hostname" , List .of (mainContainer , sideCarContainer ));
945
935
return pod ;
946
936
}
937
+
938
+ private static Stream <KubernetesConfigOptions .ServiceExposedType > serviceExposedTypes () {
939
+ return Stream .of (
940
+ null ,
941
+ KubernetesConfigOptions .ServiceExposedType .ClusterIP ,
942
+ KubernetesConfigOptions .ServiceExposedType .LoadBalancer ,
943
+ KubernetesConfigOptions .ServiceExposedType .Headless_ClusterIP ,
944
+ KubernetesConfigOptions .ServiceExposedType .NodePort );
945
+ }
947
946
}
You can’t perform that action at this time.
0 commit comments