Skip to content

fix: config override with metrics #840

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.

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

Merged
merged 2 commits into from
Jan 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ public void stop() throws OperatorException {
*/
public <R extends HasMetadata> void register(Reconciler<R> reconciler)
throws OperatorException {
final var defaultConfiguration = configurationService.getConfigurationFor(reconciler);
register(reconciler, defaultConfiguration);
final var controllerConfiguration = configurationService.getConfigurationFor(reconciler);
register(reconciler, controllerConfiguration);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ public ConfigurationService build() {
@Override
public <R extends HasMetadata> ControllerConfiguration<R> getConfigurationFor(
Reconciler<R> reconciler) {
return original.getConfigurationFor(reconciler);
ControllerConfiguration<R> controllerConfiguration =
original.getConfigurationFor(reconciler);
controllerConfiguration.setConfigurationService(this);
return controllerConfiguration;
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,21 +66,6 @@ class EventProcessor<R extends HasMetadata> implements EventHandler, LifecycleAw
eventSourceManager);
}

EventProcessor(
ReconciliationDispatcher<R> reconciliationDispatcher,
EventSourceManager<R> eventSourceManager,
String relatedControllerName,
Retry retry) {
this(
eventSourceManager.getControllerResourceEventSource().getResourceCache(),
null,
relatedControllerName,
reconciliationDispatcher,
retry,
null,
eventSourceManager);
}

EventProcessor(
ReconciliationDispatcher<R> reconciliationDispatcher,
EventSourceManager<R> eventSourceManager,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,12 @@ public void setup() {
when(controllerResourceEventSourceMock.getResourceCache()).thenReturn(resourceCacheMock);

eventProcessor =
spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test", null));
spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test", null,
null));
eventProcessor.start();
eventProcessorWithRetry =
spy(new EventProcessor(reconciliationDispatcherMock, eventSourceManagerMock, "Test",
GenericRetry.defaultLimitedExponentialRetry()));
GenericRetry.defaultLimitedExponentialRetry(), null));
eventProcessorWithRetry.start();

when(eventProcessor.retryEventSource()).thenReturn(retryTimerEventSourceMock);
Expand Down
5 changes: 5 additions & 0 deletions sample-operators/mysql-schema/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
<artifactId>operator-framework</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>micrometer-support</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.takes</groupId>
<artifactId>takes</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.javaoperatorsdk.operator.Operator;
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceOverrider;
import io.javaoperatorsdk.operator.config.runtime.DefaultConfigurationService;
import io.javaoperatorsdk.operator.monitoring.micrometer.MicrometerMetrics;
import io.micrometer.core.instrument.logging.LoggingMeterRegistry;

public class MySQLSchemaOperator {

Expand All @@ -25,7 +28,10 @@ public static void main(String[] args) throws IOException {

Config config = new ConfigBuilder().withNamespace(null).build();
KubernetesClient client = new DefaultKubernetesClient(config);
Operator operator = new Operator(client, DefaultConfigurationService.instance());
Operator operator = new Operator(client,
new ConfigurationServiceOverrider(DefaultConfigurationService.instance())
.withMetrics(new MicrometerMetrics(new LoggingMeterRegistry()))
.build());
operator.register(new MySQLSchemaReconciler(client, MySQLDbConfig.loadFromEnvironmentVars()));
operator.installShutdownHook();
operator.start();
Expand Down