Skip to content

Commit bc1a733

Browse files
committed
Merge branch 'master' into scheduling-no-resource-version-compare
2 parents eab21d3 + 7ef0302 commit bc1a733

File tree

1 file changed

+3
-2
lines changed
  • operator-framework/src/main/java/com/github/containersolutions/operator

1 file changed

+3
-2
lines changed

operator-framework/src/main/java/com/github/containersolutions/operator/Operator.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.github.containersolutions.operator.processing.retry.Retry;
88
import io.fabric8.kubernetes.api.model.apiextensions.CustomResourceDefinition;
99
import io.fabric8.kubernetes.client.CustomResource;
10+
import io.fabric8.kubernetes.client.CustomResourceDoneable;
1011
import io.fabric8.kubernetes.client.CustomResourceList;
1112
import io.fabric8.kubernetes.client.KubernetesClient;
1213
import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -71,7 +72,6 @@ private <R extends CustomResource> void registerWatches(ResourceController<R> co
7172

7273
CustomResourceOperationsImpl crClient = (CustomResourceOperationsImpl) client;
7374
if (watchAllNamespaces) {
74-
// todo test this
7575
crClient.inAnyNamespace().watch(eventScheduler);
7676
} else if (targetNamespaces.length == 0) {
7777
client.watch(eventScheduler);
@@ -99,7 +99,8 @@ public Map<Class<? extends CustomResource>, CustomResourceOperationsImpl> getCus
9999
return customResourceClients;
100100
}
101101

102-
public <T extends CustomResource> CustomResourceOperationsImpl getCustomResourceClients(Class<T> customResourceClass) {
102+
public <T extends CustomResource, L extends CustomResourceList<T>, D extends CustomResourceDoneable<T>> CustomResourceOperationsImpl<T, L, D>
103+
getCustomResourceClients(Class<T> customResourceClass) {
103104
return customResourceClients.get(customResourceClass);
104105
}
105106

0 commit comments

Comments
 (0)