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 c44062f [FLINK-26889] Eliminate the duplicated construct for
FlinkOperatorConfiguration in test
c44062f is described below
commit c44062f642e9d54d83ad80b48e16147a9b433bd6
Author: Aitozi <[email protected]>
AuthorDate: Mon Mar 28 22:37:25 2022 +0800
[FLINK-26889] Eliminate the duplicated construct for
FlinkOperatorConfiguration in test
---
.../config/FlinkOperatorConfiguration.java | 8 +++--
.../controller/FlinkDeploymentControllerTest.java | 12 ++------
.../operator/observer/SessionObserverTest.java | 34 ++++------------------
3 files changed, 13 insertions(+), 41 deletions(-)
diff --git
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkOperatorConfiguration.java
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkOperatorConfiguration.java
index e933b11..9b27745 100644
---
a/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkOperatorConfiguration.java
+++
b/flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/config/FlinkOperatorConfiguration.java
@@ -41,6 +41,12 @@ public class FlinkOperatorConfiguration {
Set<String> watchedNamespaces;
public static FlinkOperatorConfiguration fromConfiguration(Configuration
operatorConfig) {
+ Set<String> watchedNamespaces = OperatorUtils.getWatchedNamespaces();
+ return fromConfiguration(operatorConfig, watchedNamespaces);
+ }
+
+ public static FlinkOperatorConfiguration fromConfiguration(
+ Configuration operatorConfig, Set<String> watchedNamespaces) {
Duration reconcileInterval =
operatorConfig.get(OperatorConfigOptions.OPERATOR_RECONCILER_RESCHEDULE_INTERVAL);
@@ -67,8 +73,6 @@ public class FlinkOperatorConfiguration {
flinkServiceHostOverride = "localhost";
}
- Set<String> watchedNamespaces = OperatorUtils.getWatchedNamespaces();
-
return new FlinkOperatorConfiguration(
reconcileInterval,
reconcilerMaxParallelism,
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FlinkDeploymentControllerTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FlinkDeploymentControllerTest.java
index 03013cc..71348c7 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FlinkDeploymentControllerTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/controller/FlinkDeploymentControllerTest.java
@@ -19,6 +19,7 @@ package org.apache.flink.kubernetes.operator.controller;
import org.apache.flink.api.java.tuple.Tuple2;
import org.apache.flink.configuration.CheckpointingOptions;
+import org.apache.flink.configuration.Configuration;
import org.apache.flink.kubernetes.operator.TestUtils;
import org.apache.flink.kubernetes.operator.TestingFlinkService;
import org.apache.flink.kubernetes.operator.config.FlinkOperatorConfiguration;
@@ -48,7 +49,6 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.net.HttpURLConnection;
-import java.time.Duration;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -69,15 +69,7 @@ public class FlinkDeploymentControllerTest {
private final Context context =
TestUtils.createContextWithReadyJobManagerDeployment();
private final FlinkOperatorConfiguration operatorConfiguration =
- new FlinkOperatorConfiguration(
- Duration.ofSeconds(1),
- -1,
- Duration.ofSeconds(2),
- Duration.ofSeconds(3),
- Duration.ofSeconds(4),
- Duration.ofSeconds(5),
- null,
- Collections.emptySet());
+ FlinkOperatorConfiguration.fromConfiguration(new Configuration());
private TestingFlinkService flinkService;
private FlinkDeploymentController testController;
diff --git
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/SessionObserverTest.java
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/SessionObserverTest.java
index 87694dd..3f154c2 100644
---
a/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/SessionObserverTest.java
+++
b/flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/observer/SessionObserverTest.java
@@ -33,8 +33,6 @@ import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.RetryInfo;
import org.junit.jupiter.api.Test;
-import java.time.Duration;
-import java.util.Collections;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
@@ -107,35 +105,13 @@ public class SessionObserverTest {
.setLastReconciledSpec(deployment.getSpec());
FlinkOperatorConfiguration allNsConfig =
- new FlinkOperatorConfiguration(
- Duration.ofSeconds(1),
- -1,
- Duration.ofSeconds(2),
- Duration.ofSeconds(3),
- Duration.ofSeconds(4),
- Duration.ofSeconds(5),
- null,
- Collections.emptySet());
+ FlinkOperatorConfiguration.fromConfiguration(new
Configuration());
FlinkOperatorConfiguration specificNsConfig =
- new FlinkOperatorConfiguration(
- Duration.ofSeconds(1),
- -1,
- Duration.ofSeconds(2),
- Duration.ofSeconds(3),
- Duration.ofSeconds(4),
- Duration.ofSeconds(5),
- null,
- Set.of(deployment.getMetadata().getNamespace()));
+ FlinkOperatorConfiguration.fromConfiguration(
+ new Configuration(),
Set.of(deployment.getMetadata().getNamespace()));
FlinkOperatorConfiguration multipleNsConfig =
- new FlinkOperatorConfiguration(
- Duration.ofSeconds(1),
- -1,
- Duration.ofSeconds(2),
- Duration.ofSeconds(3),
- Duration.ofSeconds(4),
- Duration.ofSeconds(5),
- null,
- Set.of(deployment.getMetadata().getNamespace(), "ns"));
+ FlinkOperatorConfiguration.fromConfiguration(
+ new Configuration(),
Set.of(deployment.getMetadata().getNamespace(), "ns"));
Deployment k8sDeployment = new Deployment();
k8sDeployment.setSpec(new DeploymentSpec());
