Skip to content

Commit 0d1c1b7

Browse files
committed
fixes
1 parent 59b6d6a commit 0d1c1b7

File tree

7 files changed

+18
-30
lines changed

7 files changed

+18
-30
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void changeNamespaces(Set<String> namespaces) {
9595

9696

9797
private InformerWrapper<T> createEventSource(
98-
FilterWatchListDeletable<T, KubernetesResourceList<T>> filteredBySelectorClient,
98+
FilterWatchListDeletable<T, KubernetesResourceList<T>, Resource<T>> filteredBySelectorClient,
9999
ResourceEventHandler<T> eventHandler, String key) {
100100
var source = new InformerWrapper<>(filteredBySelectorClient.runnableInformer(0));
101101
source.addEventHandler(eventHandler);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerWrapper.java

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.List;
44
import java.util.Map;
5-
import java.util.Objects;
65
import java.util.Optional;
76
import java.util.function.Function;
87
import java.util.function.Predicate;
@@ -74,18 +73,12 @@ public Stream<ResourceID> keys() {
7473

7574
@Override
7675
public T remove(ResourceID key) {
77-
return cache.remove(cache.getByKey(getKey(key)));
76+
throw new UnsupportedOperationException();
7877
}
7978

8079
@Override
8180
public void put(ResourceID key, T resource) {
82-
// check that key matches the resource
83-
final var fromResource = ResourceID.fromResource(resource);
84-
if (!Objects.equals(key, fromResource)) {
85-
throw new IllegalArgumentException(
86-
"Key and resource don't match. Key: " + key + ", resource: " + fromResource);
87-
}
88-
cache.put(resource);
81+
throw new UnsupportedOperationException();
8982
}
9083

9184
public void addEventHandler(ResourceEventHandler<T> eventHandler) {

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,7 @@
44
import io.fabric8.kubernetes.api.model.KubernetesResourceList;
55
import io.fabric8.kubernetes.client.KubernetesClient;
66
import io.fabric8.kubernetes.client.V1ApiextensionAPIGroupDSL;
7-
import io.fabric8.kubernetes.client.dsl.ApiextensionsAPIGroupDSL;
8-
import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
9-
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
10-
import io.fabric8.kubernetes.client.dsl.MixedOperation;
11-
import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
12-
import io.fabric8.kubernetes.client.dsl.Resource;
7+
import io.fabric8.kubernetes.client.dsl.*;
138
import io.fabric8.kubernetes.client.informers.SharedIndexInformer;
149
import io.fabric8.kubernetes.client.informers.cache.Indexer;
1510

@@ -28,9 +23,9 @@ public static <T extends HasMetadata> KubernetesClient client(Class<T> clazz) {
2823
mock(MixedOperation.class);
2924
NonNamespaceOperation<T, KubernetesResourceList<T>, Resource<T>> nonNamespaceOperation =
3025
mock(NonNamespaceOperation.class);
31-
FilterWatchListMultiDeletable<T, KubernetesResourceList<T>> inAnyNamespace = mock(
32-
FilterWatchListMultiDeletable.class);
33-
FilterWatchListDeletable<T, KubernetesResourceList<T>> filterable =
26+
AnyNamespaceOperation<T, KubernetesResourceList<T>, Resource<T>> inAnyNamespace = mock(
27+
AnyNamespaceOperation.class);
28+
FilterWatchListDeletable<T, KubernetesResourceList<T>, Resource<T>> filterable =
3429
mock(FilterWatchListDeletable.class);
3530
when(resources.inNamespace(anyString())).thenReturn(nonNamespaceOperation);
3631
when(nonNamespaceOperation.withLabelSelector(nullable(String.class))).thenReturn(filterable);

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
import io.fabric8.kubernetes.api.model.ObjectMeta;
1010
import io.fabric8.kubernetes.api.model.apps.Deployment;
1111
import io.fabric8.kubernetes.client.KubernetesClient;
12-
import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
13-
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
12+
import io.fabric8.kubernetes.client.dsl.AnyNamespaceOperation;
1413
import io.fabric8.kubernetes.client.dsl.MixedOperation;
1514
import io.fabric8.kubernetes.client.informers.SharedIndexInformer;
1615
import io.fabric8.kubernetes.client.informers.cache.Indexer;
@@ -37,10 +36,10 @@ class InformerEventSourceTest {
3736
mock(TemporaryResourceCache.class);
3837
private final EventHandler eventHandlerMock = mock(EventHandler.class);
3938
private final MixedOperation crClientMock = mock(MixedOperation.class);
40-
private final FilterWatchListMultiDeletable specificResourceClientMock =
41-
mock(FilterWatchListMultiDeletable.class);
42-
private final FilterWatchListDeletable labeledResourceClientMock =
43-
mock(FilterWatchListDeletable.class);
39+
private final AnyNamespaceOperation specificResourceClientMock =
40+
mock(AnyNamespaceOperation.class);
41+
private final AnyNamespaceOperation labeledResourceClientMock =
42+
mock(AnyNamespaceOperation.class);
4443
private final SharedIndexInformer informer = mock(SharedIndexInformer.class);
4544
private final InformerConfiguration<Deployment> informerConfiguration =
4645
mock(InformerConfiguration.class);

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/sample/simple/TestCustomReconciler.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,14 @@ public TestCustomReconciler(KubernetesClient kubernetesClient, boolean updateSta
3838
@Override
3939
public DeleteControl cleanup(
4040
TestCustomResource resource, Context<TestCustomResource> context) {
41-
Boolean delete =
41+
var deletedResources =
4242
kubernetesClient
4343
.configMaps()
4444
.inNamespace(resource.getMetadata().getNamespace())
4545
.withName(resource.getSpec().getConfigMapName())
4646
.delete();
47-
if (delete) {
47+
// todo check if this is correct (probably not)
48+
if (deletedResources.size() == 1) {
4849
log.info(
4950
"Deleted ConfigMap {} for resource: {}",
5051
resource.getSpec().getConfigMapName(),

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/AbstractOperatorExtension.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,9 @@ public <T extends HasMetadata> T replace(Class<T> type, T resource) {
110110

111111
@SuppressWarnings("unchecked")
112112
public <T extends HasMetadata> boolean delete(Class<T> type, T resource) {
113-
return kubernetesClient.resources(type).inNamespace(namespace).delete(resource);
113+
// todo check
114+
kubernetesClient.resource(resource).inNamespace(namespace).delete();
115+
return true;
114116
}
115117

116118
protected void beforeAllImpl(ExtensionContext context) {

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

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

3-
import java.util.*;
4-
53
import io.fabric8.kubernetes.api.model.HasMetadata;
64
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
75

0 commit comments

Comments
 (0)