Skip to content

Commit a681a1b

Browse files
adam-sandormetacosmcsviri
committed
feat: Add tomcat operator sample (#659)
fixed informer bug and related IT as part of this commit Co-authored-by: Chris Laprun <[email protected]> Co-authored-by: Attila Mészáros <[email protected]> Co-authored-by: Adam Sándor <[email protected]>
1 parent d537da2 commit a681a1b

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ControllerResourceEventSource.java

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package io.javaoperatorsdk.operator.processing.event.source;
22

3-
import java.util.*;
3+
import java.util.Collections;
4+
import java.util.Map;
5+
import java.util.Objects;
6+
import java.util.Optional;
47
import java.util.concurrent.ConcurrentHashMap;
58

6-
import org.slf4j.Logger;
7-
import org.slf4j.LoggerFactory;
8-
99
import io.fabric8.kubernetes.api.model.HasMetadata;
1010
import io.fabric8.kubernetes.api.model.KubernetesResourceList;
1111
import io.fabric8.kubernetes.client.KubernetesClientException;
@@ -21,6 +21,9 @@
2121
import io.javaoperatorsdk.operator.processing.ResourceCache;
2222
import io.javaoperatorsdk.operator.processing.event.ResourceID;
2323

24+
import org.slf4j.Logger;
25+
import org.slf4j.LoggerFactory;
26+
2427
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getName;
2528
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
2629
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
@@ -175,8 +178,6 @@ public Optional<T> getCustomResource(ResourceID resourceID) {
175178
}
176179
}
177180

178-
179-
180181
/**
181182
* @return shared informers by namespace. If custom resource is not namespace scoped use
182183
* CustomResourceEventSource.ANY_NAMESPACE_MAP_KEY

Diff for: operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerEventSourceIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void testUsingInformerToWatchChangesOfConfigMap() {
4040
waitForCRStatusValue(INITIAL_STATUS_MESSAGE);
4141

4242
configMap.getData().put(TARGET_CONFIG_MAP_KEY, UPDATE_STATUS_MESSAGE);
43-
operator.replace(ConfigMap.class, configMap);
43+
configMap = operator.replace(ConfigMap.class, configMap);
4444

4545
waitForCRStatusValue(UPDATE_STATUS_MESSAGE);
4646
}

0 commit comments

Comments
 (0)