Skip to content

Commit 2ef4ba0

Browse files
committed
setting propagation fixes
Signed-off-by: Attila Mészáros <csviri@gmail.com>
1 parent bbd3af1 commit 2ef4ba0

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,16 @@ public InformerConfigurationBuilder<R> withConfig(InformerConfigSpec<R> spec) {
202202
+ GenericKubernetesDependentResource.class.getSimpleName());
203203
}
204204

205-
return withGenericFilter(spec.genericFilter())
205+
return withName(spec.name())
206+
.withGenericFilter(spec.genericFilter())
207+
.withSecondaryToPrimaryMapper(spec.secondaryToPrimaryMapper())
208+
.withPrimaryToSecondaryMapper(spec.primaryToSecondaryMapper())
206209
.withLabelSelector(spec.labelSelector())
207210
.withNamespaces(spec.namespaces())
208211
.withOnAddFilter(spec.onAddFilter())
209212
.withOnUpdateFilter(spec.onUpdateFilter())
210-
.withOnDeleteFilter(spec.onDeleteFilter());
213+
.withOnDeleteFilter(spec.onDeleteFilter())
214+
.followControllerNamespacesOnChange(spec.followControllerNamespacesOnChange());
211215
}
212216

213217
public <P extends HasMetadata> InformerConfigurationBuilder<R> withPrimaryToSecondaryMapper(

operator-framework/src/test/java/io/javaoperatorsdk/operator/WorkflowExplicitInvocationIT.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package io.javaoperatorsdk.operator;
22

3+
import java.time.Duration;
4+
35
import org.junit.jupiter.api.Test;
46
import org.junit.jupiter.api.extension.RegisterExtension;
57

@@ -48,7 +50,7 @@ void workflowInvokedExplicitly() {
4850

4951
// The ConfigMap is not garbage collected, this tests that even if the cleaner is not
5052
// implemented the workflow cleanup still called even if there is explicit invocation
51-
await().untilAsserted(() -> {
53+
await().timeout(Duration.ofSeconds(30)).untilAsserted(() -> {
5254
assertThat(extension.get(ConfigMap.class, RESOURCE_NAME)).isNull();
5355
});
5456
}

0 commit comments

Comments
 (0)