Skip to content

Commit c3f6732

Browse files
committed
fixes after master merge
1 parent d7abd56 commit c3f6732

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventDispatcher.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,4 @@ private void addFinalizerIfNotPresent(R resource) {
100100
private boolean markedForDeletion(R resource) {
101101
return resource.getMetadata().getDeletionTimestamp() != null && !resource.getMetadata().getDeletionTimestamp().isEmpty();
102102
}
103-
104-
@Override
105-
public void onClose(KubernetesClientException e) {
106-
if (e != null) {
107-
log.error("Error: ", e);
108-
// we will exit the application if there was a watching exception, because of the bug in fabric8 client
109-
// see https://github.com/fabric8io/kubernetes-client/issues/1318
110-
System.exit(1);
111-
}
112-
}
113103
}

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,14 @@ void eventProcessingFailed(CustomResourceEvent event) {
168168
}
169169
}
170170

171-
// todo review this in light of new restart functionality from master
172171
@Override
173172
public void onClose(KubernetesClientException e) {
174-
// todo re apply the watch
173+
if (e != null) {
174+
log.error("Error: ", e);
175+
// we will exit the application if there was a watching exception, because of the bug in fabric8 client
176+
// see https://github.com/fabric8io/kubernetes-client/issues/1318
177+
System.exit(1);
178+
}
175179
}
176180
}
177181

0 commit comments

Comments
 (0)