Skip to content

Commit 28cfba9

Browse files
authored
Merge pull request #897 from yue9944882/bugfix/reconcile-spring-queue-injection
Fixes work-queue injection for spring integration
2 parents b2c53e8 + 4816742 commit 28cfba9

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

spring/src/main/java/io/kubernetes/client/spring/extended/controller/KubernetesReconcilerProcessor.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ private Controller buildController(SharedInformerFactory sharedInformerFactory,
7474

7575
KubernetesReconcilerWatches watches = kubernetesReconciler.watches();
7676
DefaultControllerBuilder builder = ControllerBuilder.defaultBuilder(sharedInformerFactory);
77+
RateLimitingQueue<Request> workQueue = new DefaultRateLimitingQueue<>();
78+
builder = builder.withWorkQueue(workQueue);
7779
for (KubernetesReconcilerWatch watch : watches.value()) {
7880
try {
7981
Predicate addFilter = null;
@@ -101,8 +103,8 @@ private Controller buildController(SharedInformerFactory sharedInformerFactory,
101103
final BiPredicate finalDeleteFilter = deleteFilter;
102104
builder =
103105
builder.watch(
104-
(workQueue) -> {
105-
return ControllerBuilder.controllerWatchBuilder(watch.apiTypeClass(), workQueue)
106+
(q) -> {
107+
return ControllerBuilder.controllerWatchBuilder(watch.apiTypeClass(), q)
106108
.withOnAddFilter(finalAddFilter)
107109
.withOnUpdateFilter(finalUpdateFilter)
108110
.withOnDeleteFilter(finalDeleteFilter)
@@ -124,8 +126,7 @@ private Controller buildController(SharedInformerFactory sharedInformerFactory,
124126
builder = builder.withWorkerCount(workerCount.value());
125127
}
126128

127-
RateLimitingQueue<Request> workQueue = new DefaultRateLimitingQueue<>();
128-
return builder.withReconciler(r).withName(reconcilerName).withWorkQueue(workQueue).build();
129+
return builder.withReconciler(r).withName(reconcilerName).build();
129130
}
130131

131132
private static class AddFilterAdaptor implements Predicate {

0 commit comments

Comments
 (0)