Create OperatorContext for each reconciler test This ensures that the chosen context is the expected one. Change-Id: Ic17690d24176ffa63899ac05c837a99090130cbd
diff --git a/operator/src/test/java/com/google/gerrit/k8s/operator/gerrit/dependent/GerritTest.java b/operator/src/test/java/com/google/gerrit/k8s/operator/gerrit/dependent/GerritTest.java index ccd3554..e8bc806 100644 --- a/operator/src/test/java/com/google/gerrit/k8s/operator/gerrit/dependent/GerritTest.java +++ b/operator/src/test/java/com/google/gerrit/k8s/operator/gerrit/dependent/GerritTest.java
@@ -17,6 +17,8 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.k8s.operator.test.KubernetesResourceAssert.assertUnordered; +import com.google.gerrit.k8s.operator.Constants.ClusterMode; +import com.google.gerrit.k8s.operator.OperatorContext; import com.google.gerrit.k8s.operator.api.model.gerrit.Gerrit; import com.google.gerrit.k8s.operator.gerrit.GerritReconciler; import io.fabric8.kubernetes.api.model.ConfigMap; @@ -48,6 +50,7 @@ @BeforeAll public void setup() throws Exception { kubernetesServer.before(); + OperatorContext.createInstance(ClusterMode.HIGH_AVAILABILITY, "cluster.local"); } @ParameterizedTest
diff --git a/operator/src/test/java/com/google/gerrit/k8s/operator/gitgc/dependent/GitGarbageCollectionTest.java b/operator/src/test/java/com/google/gerrit/k8s/operator/gitgc/dependent/GitGarbageCollectionTest.java index 80d8073..a5b9eef 100644 --- a/operator/src/test/java/com/google/gerrit/k8s/operator/gitgc/dependent/GitGarbageCollectionTest.java +++ b/operator/src/test/java/com/google/gerrit/k8s/operator/gitgc/dependent/GitGarbageCollectionTest.java
@@ -16,6 +16,8 @@ import static com.google.gerrit.k8s.operator.test.KubernetesResourceAssert.assertUnordered; +import com.google.gerrit.k8s.operator.Constants.ClusterMode; +import com.google.gerrit.k8s.operator.OperatorContext; import com.google.gerrit.k8s.operator.api.model.cluster.GerritCluster; import com.google.gerrit.k8s.operator.api.model.gitgc.GitGarbageCollection; import com.google.gerrit.k8s.operator.gitgc.GitGarbageCollectionReconciler; @@ -52,6 +54,7 @@ @BeforeAll public void setup() throws Exception { kubernetesServer.before(); + OperatorContext.createInstance(ClusterMode.HIGH_AVAILABILITY, "cluster.local"); } @ParameterizedTest
diff --git a/operator/src/test/java/com/google/gerrit/k8s/operator/maintenance/dependent/GerritMaintenanceTest.java b/operator/src/test/java/com/google/gerrit/k8s/operator/maintenance/dependent/GerritMaintenanceTest.java index 5391f06..1e90907 100644 --- a/operator/src/test/java/com/google/gerrit/k8s/operator/maintenance/dependent/GerritMaintenanceTest.java +++ b/operator/src/test/java/com/google/gerrit/k8s/operator/maintenance/dependent/GerritMaintenanceTest.java
@@ -16,6 +16,8 @@ import static com.google.gerrit.k8s.operator.test.KubernetesResourceAssert.assertUnordered; +import com.google.gerrit.k8s.operator.Constants.ClusterMode; +import com.google.gerrit.k8s.operator.OperatorContext; import com.google.gerrit.k8s.operator.api.model.maintenance.GerritMaintenance; import io.fabric8.kubernetes.api.model.batch.v1.CronJob; import io.javaoperatorsdk.operator.ReconcilerUtils; @@ -34,6 +36,7 @@ @ParameterizedTest @MethodSource("provideYamlManifests") public void expectedCronJobCreated(String inputFile, List<String> expectedOutputFiles) { + OperatorContext.createInstance(ClusterMode.HIGH_AVAILABILITY, "cluster.local"); GerritMaintenance input = ReconcilerUtils.loadYaml(GerritMaintenance.class, this.getClass(), inputFile);
diff --git a/operator/src/test/java/com/google/gerrit/k8s/operator/network/ambassador/dependent/GerritClusterAmbassadorTest.java b/operator/src/test/java/com/google/gerrit/k8s/operator/network/ambassador/dependent/GerritClusterAmbassadorTest.java index aa51fb3..6e3afa5 100644 --- a/operator/src/test/java/com/google/gerrit/k8s/operator/network/ambassador/dependent/GerritClusterAmbassadorTest.java +++ b/operator/src/test/java/com/google/gerrit/k8s/operator/network/ambassador/dependent/GerritClusterAmbassadorTest.java
@@ -16,6 +16,8 @@ import static com.google.gerrit.k8s.operator.test.KubernetesResourceAssert.assertUnordered; +import com.google.gerrit.k8s.operator.Constants.ClusterMode; +import com.google.gerrit.k8s.operator.OperatorContext; import com.google.gerrit.k8s.operator.api.model.network.GerritNetwork; import io.getambassador.v2.Host; import io.getambassador.v2.Mapping; @@ -39,6 +41,7 @@ InstantiationException, IllegalAccessException, InvocationTargetException { + OperatorContext.createInstance(ClusterMode.HIGH_AVAILABILITY, "cluster.local"); GerritNetwork gerritNetwork = ReconcilerUtils.loadYaml(GerritNetwork.class, this.getClass(), inputFile);
diff --git a/operator/src/test/java/com/google/gerrit/k8s/operator/network/ingress/dependent/GerritClusterIngressTest.java b/operator/src/test/java/com/google/gerrit/k8s/operator/network/ingress/dependent/GerritClusterIngressTest.java index 331fc59..8caf097 100644 --- a/operator/src/test/java/com/google/gerrit/k8s/operator/network/ingress/dependent/GerritClusterIngressTest.java +++ b/operator/src/test/java/com/google/gerrit/k8s/operator/network/ingress/dependent/GerritClusterIngressTest.java
@@ -17,6 +17,8 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.k8s.operator.test.KubernetesResourceAssert.assertUnordered; +import com.google.gerrit.k8s.operator.Constants.ClusterMode; +import com.google.gerrit.k8s.operator.OperatorContext; import com.google.gerrit.k8s.operator.api.model.network.GerritNetwork; import io.fabric8.kubernetes.api.model.networking.v1.Ingress; import io.javaoperatorsdk.operator.ReconcilerUtils; @@ -29,6 +31,7 @@ @ParameterizedTest @MethodSource("provideYamlManifests") public void expectedGerritClusterIngressCreated(String inputFile, String expectedOutputFile) { + OperatorContext.createInstance(ClusterMode.HIGH_AVAILABILITY, "cluster.local"); GerritClusterIngress dependent = new GerritClusterIngress(); Ingress result = dependent.desired(
diff --git a/operator/src/test/java/com/google/gerrit/k8s/operator/receiver/dependent/ReceiverTest.java b/operator/src/test/java/com/google/gerrit/k8s/operator/receiver/dependent/ReceiverTest.java index 3762905..86d0853 100644 --- a/operator/src/test/java/com/google/gerrit/k8s/operator/receiver/dependent/ReceiverTest.java +++ b/operator/src/test/java/com/google/gerrit/k8s/operator/receiver/dependent/ReceiverTest.java
@@ -16,6 +16,8 @@ import static com.google.gerrit.k8s.operator.test.KubernetesResourceAssert.assertUnordered; +import com.google.gerrit.k8s.operator.Constants.ClusterMode; +import com.google.gerrit.k8s.operator.OperatorContext; import com.google.gerrit.k8s.operator.api.model.receiver.Receiver; import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.apps.Deployment; @@ -30,6 +32,7 @@ @MethodSource("provideYamlManifests") public void expectedReceiverComponentsCreated( String inputFile, String expectedDeployment, String expectedService) { + OperatorContext.createInstance(ClusterMode.HIGH_AVAILABILITY, "cluster.local"); Receiver input = ReconcilerUtils.loadYaml(Receiver.class, this.getClass(), inputFile); ReceiverDeployment dependentDeployment = new ReceiverDeployment(); assertUnordered(
diff --git a/operator/src/test/java/com/google/gerrit/k8s/operator/tasks/incomingrepl/dependent/IncomingReplicationTaskTest.java b/operator/src/test/java/com/google/gerrit/k8s/operator/tasks/incomingrepl/dependent/IncomingReplicationTaskTest.java index b06cec2..58a269b 100644 --- a/operator/src/test/java/com/google/gerrit/k8s/operator/tasks/incomingrepl/dependent/IncomingReplicationTaskTest.java +++ b/operator/src/test/java/com/google/gerrit/k8s/operator/tasks/incomingrepl/dependent/IncomingReplicationTaskTest.java
@@ -17,6 +17,8 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.gerrit.k8s.operator.test.KubernetesResourceAssert.assertUnordered; +import com.google.gerrit.k8s.operator.Constants.ClusterMode; +import com.google.gerrit.k8s.operator.OperatorContext; import com.google.gerrit.k8s.operator.api.model.cluster.GerritCluster; import com.google.gerrit.k8s.operator.api.model.tasks.incomingrepl.IncomingReplicationTask; import com.google.gerrit.k8s.operator.cluster.dependent.ClusterManagedIncomingReplicationTask; @@ -53,6 +55,7 @@ @BeforeAll public void setup() throws Exception { kubernetesServer.before(); + OperatorContext.createInstance(ClusterMode.HIGH_AVAILABILITY, "cluster.local"); } @ParameterizedTest