wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

sample-operators/metrics-processing/src/main/java/io/javaoperatorsdk/operator/sample/metrics/MetricsHandlingReconciler1.java

@@ -26,10 +26,14 @@
 import io.javaoperatorsdk.operator.processing.event.source.timer.TimerEventSource;
 import io.javaoperatorsdk.operator.sample.metrics.customresource.MetricsHandlingCustomResource1;
 
-@ControllerConfiguration
+import static io.javaoperatorsdk.operator.sample.metrics.MetricsHandlingReconciler1.NAME;
+
+@ControllerConfiguration(name = NAME)
 public class MetricsHandlingReconciler1
     extends AbstractMetricsHandlingReconciler<MetricsHandlingCustomResource1> {
 
+  public static final String NAME = "MetricsHandlingReconciler1";
+
   private static final long TIMER_DELAY = 5000;
 
   private final TimerEventSource<MetricsHandlingCustomResource1> timerEventSource;

sample-operators/metrics-processing/src/main/java/io/javaoperatorsdk/operator/sample/metrics/MetricsHandlingReconciler2.java

@@ -22,6 +22,8 @@
 public class MetricsHandlingReconciler2
     extends AbstractMetricsHandlingReconciler<MetricsHandlingCustomResource2> {
 
+  public static final String NAME = "MetricsHandlingReconciler2";
+
   public MetricsHandlingReconciler2() {
     super(150);
   }

sample-operators/metrics-processing/src/main/java/io/javaoperatorsdk/operator/sample/metrics/MetricsHandlingSampleOperator.java

@@ -23,9 +23,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import io.javaoperatorsdk.operator.config.loader.ConfigProvider;
-import io.javaoperatorsdk.operator.config.loader.provider.EnvVarConfigProvider;
-import io.javaoperatorsdk.operator.config.loader.provider.YamlConfigProvider;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
@@ -34,6 +31,11 @@
 
 import io.javaoperatorsdk.operator.Operator;
 import io.javaoperatorsdk.operator.api.monitoring.Metrics;
+import io.javaoperatorsdk.operator.config.loader.ConfigLoader;
+import io.javaoperatorsdk.operator.config.loader.ConfigProvider;
+import io.javaoperatorsdk.operator.config.loader.provider.AggregatePriorityListConfigProvider;
+import io.javaoperatorsdk.operator.config.loader.provider.EnvVarConfigProvider;
+import io.javaoperatorsdk.operator.config.loader.provider.YamlConfigProvider;
 import io.javaoperatorsdk.operator.monitoring.micrometer.MicrometerMetricsV2;
 import io.micrometer.core.instrument.Clock;
 import io.micrometer.core.instrument.MeterRegistry;
@@ -70,12 +72,17 @@ public static void main(String[] args) {
     var configProviders = new ArrayList<ConfigProvider>();
     configProviders.add(new EnvVarConfigProvider());
     configProviders.add(new YamlConfigProvider(Path.of("/config/config.yaml")));
+    var configLoader = new ConfigLoader(new AggregatePriorityListConfigProvider(configProviders));
 
     Metrics metrics = initOTLPMetrics(isLocal());
     Operator operator =
-        new Operator(o -> o.withStopOnInformerErrorDuringStartup(false).withMetrics(metrics));
-    operator.register(new MetricsHandlingReconciler1());
-    operator.register(new MetricsHandlingReconciler2());
+        new Operator(o -> configLoader.applyConfigs().andThen(k -> k.withMetrics(metrics)));
+    operator.register(
+        new MetricsHandlingReconciler1(),
+        configLoader.applyControllerConfigs(MetricsHandlingReconciler1.NAME));
+    operator.register(
+        new MetricsHandlingReconciler2(),
+        configLoader.applyControllerConfigs(MetricsHandlingReconciler2.NAME));
     operator.start();
   }
 

sample-operators/metrics-processing/src/test/java/io/javaoperatorsdk/operator/sample/metrics/MetricsHandlingE2E.java

@@ -77,8 +77,7 @@ class MetricsHandlingE2E {
               .withConfigurationService(
                   c -> c.withMetrics(MetricsHandlingSampleOperator.initOTLPMetrics(true)))
               .build()
-          : ClusterDeployedOperatorExtension.builder()
-              .build();
+          : ClusterDeployedOperatorExtension.builder().build();
 
   @BeforeAll
   void setup() {
@@ -105,22 +104,28 @@ void cleanup() throws IOException {
 
   private void helmInstall() {
     try {
-      var chartPath = findProjectRoot("helm").toPath()
-          .resolve("helm/generic-helm-chart").toString();
-      var valuesUrl = MetricsHandlingE2E.class.getClassLoader()
-          .getResource("helm-values.yaml");
+      var chartPath =
+          findProjectRoot("helm").toPath().resolve("helm/generic-helm-chart").toString();
+      var valuesUrl = MetricsHandlingE2E.class.getClassLoader().getResource("helm-values.yaml");
       if (valuesUrl == null) {
         throw new IllegalStateException("helm-values.yaml not found on classpath");
       }
       var valuesPath = new File(valuesUrl.toURI()).getAbsolutePath();
       var namespace = operator.getNamespace();
 
       log.info("Installing helm release '{}' into namespace '{}'", HELM_RELEASE_NAME, namespace);
-      runCommand("helm", "install", HELM_RELEASE_NAME, chartPath,
-          "-f", valuesPath,
-          "--namespace", namespace,
+      runCommand(
+          "helm",
+          "install",
+          HELM_RELEASE_NAME,
+          chartPath,
+          "-f",
+          valuesPath,
+          "--namespace",
+          namespace,
           "--wait",
-          "--timeout", "2m");
+          "--timeout",
+          "2m");
       log.info("Helm release '{}' installed successfully", HELM_RELEASE_NAME);
     } catch (Exception e) {
       throw new RuntimeException("Failed to install helm chart", e);
@@ -131,10 +136,15 @@ private void helmUninstall() {
     try {
       var namespace = operator.getNamespace();
       log.info("Uninstalling helm release '{}' from namespace '{}'", HELM_RELEASE_NAME, namespace);
-      runCommand("helm", "uninstall", HELM_RELEASE_NAME,
-          "--namespace", namespace,
+      runCommand(
+          "helm",
+          "uninstall",
+          HELM_RELEASE_NAME,
+          "--namespace",
+          namespace,
           "--wait",
-          "--timeout", "2m");
+          "--timeout",
+          "2m");
       log.info("Helm release '{}' uninstalled successfully", HELM_RELEASE_NAME);
     } catch (Exception e) {
       log.warn("Failed to uninstall helm release", e);
@@ -347,8 +357,11 @@ private String queryPrometheus(String prometheusUrl, String query) throws IOExce
 
   private void installObservabilityServices() {
     try {
-      File scriptFile = findProjectRoot("observability").toPath()
-          .resolve("observability/install-observability.sh").toFile();
+      File scriptFile =
+          findProjectRoot("observability")
+              .toPath()
+              .resolve("observability/install-observability.sh")
+              .toFile();
       log.info("Running observability setup script: {}", scriptFile.getAbsolutePath());
       runCommand("/bin/sh", scriptFile.getAbsolutePath());
       log.info("Observability stack is ready");
@@ -370,9 +383,7 @@ private static File findProjectRoot(String marker) throws IOException {
   }
 
   private static void runCommand(String... command) throws IOException, InterruptedException {
-    var process = new ProcessBuilder(command)
-        .redirectErrorStream(true)
-        .start();
+    var process = new ProcessBuilder(command).redirectErrorStream(true).start();
     try (var reader = new BufferedReader(new InputStreamReader(process.getInputStream()))) {
       String line;
       while ((line = reader.readLine()) != null) {