Skip to content

Commit b5098c4

Browse files
committed
fix: merge issues from master
1 parent 357d601 commit b5098c4

File tree

6 files changed

+5
-14
lines changed

6 files changed

+5
-14
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfiguration.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
package io.javaoperatorsdk.operator.api.config;
22

3-
import java.lang.reflect.ParameterizedType;
43
import java.time.Duration;
54
import java.util.Collections;
65
import java.util.List;
76
import java.util.Optional;
8-
import java.util.Set;
97

108
import io.fabric8.kubernetes.api.model.HasMetadata;
119
import io.javaoperatorsdk.operator.ReconcilerUtils;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultControllerConfiguration.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import java.time.Duration;
44
import java.util.Collections;
5-
import java.util.Optional;
65
import java.util.List;
6+
import java.util.Optional;
77
import java.util.Set;
88

99
import io.fabric8.kubernetes.api.model.HasMetadata;
@@ -44,10 +44,7 @@ public DefaultControllerConfiguration(
4444
this.crdName = crdName;
4545
this.finalizer = finalizer;
4646
this.generationAware = generationAware;
47-
this.namespaces =
48-
namespaces != null ? Collections.unmodifiableSet(namespaces) : Collections.emptySet();
4947
this.reconciliationMaxInterval = reconciliationMaxInterval;
50-
this.watchAllNamespaces = this.namespaces.isEmpty();
5148
this.retryConfiguration =
5249
retryConfiguration == null
5350
? ControllerConfiguration.super.getRetryConfiguration()

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ControllerManagerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private static class TestControllerConfiguration<R extends HasMetadata>
6363
public TestControllerConfiguration(Reconciler<R> controller, Class<R> crClass) {
6464
super(null, getControllerName(controller),
6565
CustomResource.getCRDName(crClass), null, false, null, null, null, null, crClass,
66-
null, null);
66+
null, null, null);
6767
this.controller = controller;
6868
}
6969

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/ResourceEventFilterTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@
77
import org.junit.jupiter.api.Test;
88

99
import io.fabric8.kubernetes.api.model.HasMetadata;
10-
import io.fabric8.kubernetes.api.model.ObjectMeta;
1110
import io.javaoperatorsdk.operator.MockKubernetesClient;
12-
import io.fabric8.kubernetes.api.model.KubernetesResourceList;
13-
import io.fabric8.kubernetes.client.dsl.MixedOperation;
14-
import io.fabric8.kubernetes.client.dsl.Resource;
1511
import io.javaoperatorsdk.operator.TestUtils;
1612
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
1713
import io.javaoperatorsdk.operator.api.config.DefaultControllerConfiguration;
@@ -144,7 +140,7 @@ public ControllerConfig(String finalizer, boolean generationAware,
144140
eventFilter,
145141
customResourceClass,
146142
null,
147-
null);
143+
null, null);
148144
}
149145
}
150146

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSourceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ public TestConfiguration(boolean generationAware) {
163163
null,
164164
TestCustomResource.class,
165165
null,
166-
null);
166+
null, null);
167167
}
168168
}
169169
}

operator-framework/src/main/java/io/javaoperatorsdk/operator/config/runtime/AnnotationConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.javaoperatorsdk.operator.config.runtime;
22

3+
import java.time.Duration;
34
import java.util.ArrayList;
45
import java.util.Collections;
56
import java.util.List;
6-
import java.time.Duration;
77
import java.util.Optional;
88
import java.util.Set;
99
import java.util.function.Function;

0 commit comments

Comments
 (0)