Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: preserve the original itemstore #2154

Merged
merged 1 commit into from
Dec 7, 2023
Merged

fix: preserve the original itemstore #2154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...rc/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverrider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ private ControllerConfigurationOverrider(ControllerConfiguration<R> original) {
this.name = original.getName();
this.fieldManager = original.fieldManager();
this.informerListLimit = original.getInformerListLimit().orElse(null);
this.itemStore = original.getItemStore().orElse(null);
}

public ControllerConfigurationOverrider<R> withFinalizer(String finalizer) {
Expand Down
23 changes: 22 additions & 1 deletion ...est/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
import org.junit.jupiter.api.Test;

import io.fabric8.kubernetes.api.model.ConfigMap;
import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.client.informers.cache.BasicItemStore;
import io.fabric8.kubernetes.client.informers.cache.Cache;
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceConfigurationResolver;
import io.javaoperatorsdk.operator.api.reconciler.Constants;
import io.javaoperatorsdk.operator.api.reconciler.Context;
Expand Down Expand Up @@ -130,7 +133,15 @@ private io.javaoperatorsdk.operator.api.config.ControllerConfiguration<?> create
return configurationService.configFor(reconciler);
}

@ControllerConfiguration(namespaces = "foo")
private static class MyItemStore<T extends HasMetadata> extends BasicItemStore<T> {

public MyItemStore() {
super(Cache::metaNamespaceKeyFunc);
}

}

@ControllerConfiguration(namespaces = "foo", itemStore = MyItemStore.class)
private static class WatchCurrentReconciler implements Reconciler<ConfigMap> {

@Override
Expand Down Expand Up @@ -187,6 +198,16 @@ void overridingNamespacesShouldWork() {
assertFalse(configuration.watchCurrentNamespace());
}

@Test
void itemStorePreserved() {
var configuration = createConfiguration(new WatchCurrentReconciler());

configuration = ControllerConfigurationOverrider.override(configuration)
.build();

assertNotNull(configuration.getItemStore().orElse(null));
}

@Test
void configuredDependentShouldNotChangeOnParentOverrideEvenWhenInitialConfigIsSame() {
var configuration = createConfiguration(new OverriddenNSOnDepReconciler());
Expand Down