Skip to content

fix: invoke ConfigurationServiceOverrider consumer only once in Operator constructor #3353

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

Open
Dennis-Mircea wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −14
Open

fix: invoke ConfigurationServiceOverrider consumer only once in Operator constructor #3353

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
17 changes: 3 additions & 14 deletions operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,21 +122,10 @@ private void init(ConfigurationService configurationService, boolean allowDeferr
*/
protected ConfigurationService initConfigurationService(
KubernetesClient client, Consumer<ConfigurationServiceOverrider> overrider) {
// initialize the client if the user didn't provide one
if (client == null) {
var configurationService = ConfigurationService.newOverriddenConfigurationService(overrider);
client = configurationService.getKubernetesClient();
if (client != null) {
Consumer<ConfigurationServiceOverrider> bindClient = o -> o.withKubernetesClient(client);
overrider = overrider == null ? bindClient : overrider.andThen(bindClient);
}

final var kubernetesClient = client;

// override the configuration service to use the same client
if (overrider != null) {
overrider = overrider.andThen(o -> o.withKubernetesClient(kubernetesClient));
} else {
overrider = o -> o.withKubernetesClient(kubernetesClient);
}

return ConfigurationService.newOverriddenConfigurationService(overrider);
}

Expand Down
Loading