Merge branch 'main' into feat/operator-java-opts

Apicurio · Feb 12, 2025 · 7f6b14b · 7f6b14b
2 parents a9c0f9c + 64e54a6
commit 7f6b14b
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 69 deletions.
diff --git a/...r/controller/src/main/java/io/apicurio/registry/operator/ApicurioRegistry3Reconciler.java b/...r/controller/src/main/java/io/apicurio/registry/operator/ApicurioRegistry3Reconciler.java
@@ -2,62 +2,20 @@
 
 import io.apicurio.registry.operator.api.v1.ApicurioRegistry3;
 import io.apicurio.registry.operator.resource.LabelDiscriminators.AppDeploymentDiscriminator;
-import io.apicurio.registry.operator.resource.app.AppDeploymentResource;
-import io.apicurio.registry.operator.resource.app.AppIngressResource;
-import io.apicurio.registry.operator.resource.app.AppNetworkPolicyResource;
-import io.apicurio.registry.operator.resource.app.AppPodDisruptionBudgetResource;
-import io.apicurio.registry.operator.resource.app.AppServiceResource;
-import io.apicurio.registry.operator.resource.studioui.StudioUIDeploymentResource;
-import io.apicurio.registry.operator.resource.studioui.StudioUIIngressResource;
-import io.apicurio.registry.operator.resource.studioui.StudioUINetworkPolicyResource;
-import io.apicurio.registry.operator.resource.studioui.StudioUIPodDisruptionBudgetResource;
-import io.apicurio.registry.operator.resource.studioui.StudioUIServiceResource;
-import io.apicurio.registry.operator.resource.ui.UIDeploymentResource;
-import io.apicurio.registry.operator.resource.ui.UIIngressResource;
-import io.apicurio.registry.operator.resource.ui.UINetworkPolicyResource;
-import io.apicurio.registry.operator.resource.ui.UIPodDisruptionBudgetResource;
-import io.apicurio.registry.operator.resource.ui.UIServiceResource;
+import io.apicurio.registry.operator.resource.app.*;
+import io.apicurio.registry.operator.resource.studioui.*;
+import io.apicurio.registry.operator.resource.ui.*;
 import io.apicurio.registry.operator.updater.IngressCRUpdater;
 import io.apicurio.registry.operator.updater.KafkaSqlCRUpdater;
 import io.apicurio.registry.operator.updater.SqlCRUpdater;
 import io.fabric8.kubernetes.api.model.apps.Deployment;
-import io.javaoperatorsdk.operator.api.reconciler.Cleaner;
-import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
-import io.javaoperatorsdk.operator.api.reconciler.DeleteControl;
-import io.javaoperatorsdk.operator.api.reconciler.ErrorStatusHandler;
-import io.javaoperatorsdk.operator.api.reconciler.ErrorStatusUpdateControl;
-import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
-import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
+import io.javaoperatorsdk.operator.api.reconciler.*;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static io.apicurio.registry.operator.resource.ActivationConditions.AppIngressActivationCondition;
-import static io.apicurio.registry.operator.resource.ActivationConditions.AppNetworkPolicyActivationCondition;
-import static io.apicurio.registry.operator.resource.ActivationConditions.AppPodDisruptionBudgetActivationCondition;
-import static io.apicurio.registry.operator.resource.ActivationConditions.StudioUIDeploymentActivationCondition;
-import static io.apicurio.registry.operator.resource.ActivationConditions.StudioUIIngressActivationCondition;
-import static io.apicurio.registry.operator.resource.ActivationConditions.StudioUINetworkPolicyActivationCondition;
-import static io.apicurio.registry.operator.resource.ActivationConditions.StudioUIPodDisruptionBudgetActivationCondition;
-import static io.apicurio.registry.operator.resource.ActivationConditions.UIIngressActivationCondition;
-import static io.apicurio.registry.operator.resource.ActivationConditions.UINetworkPolicyActivationCondition;
-import static io.apicurio.registry.operator.resource.ActivationConditions.UIPodDisruptionBudgetActivationCondition;
-import static io.apicurio.registry.operator.resource.ResourceKey.APP_DEPLOYMENT_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.APP_INGRESS_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.APP_NETWORK_POLICY_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.APP_POD_DISRUPTION_BUDGET_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.APP_SERVICE_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.STUDIO_UI_DEPLOYMENT_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.STUDIO_UI_INGRESS_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.STUDIO_UI_NETWORK_POLICY_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.STUDIO_UI_POD_DISRUPTION_BUDGET_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.STUDIO_UI_SERVICE_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.UI_DEPLOYMENT_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.UI_INGRESS_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.UI_NETWORK_POLICY_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.UI_POD_DISRUPTION_BUDGET_ID;
-import static io.apicurio.registry.operator.resource.ResourceKey.UI_SERVICE_ID;
+import static io.apicurio.registry.operator.resource.ActivationConditions.*;
+import static io.apicurio.registry.operator.resource.ResourceKey.*;
 
 @ControllerConfiguration(
         dependents = {
@@ -155,9 +113,9 @@ public class ApicurioRegistry3Reconciler implements Reconciler<ApicurioRegistry3
     private static final Logger log = LoggerFactory.getLogger(ApicurioRegistry3Reconciler.class);
 
     public UpdateControl<ApicurioRegistry3> reconcile(ApicurioRegistry3 primary,
-            Context<ApicurioRegistry3> context) {
+                                                      Context<ApicurioRegistry3> context) {
 
-        log.info("Reconciling Apicurio Registry: {}", primary);
+        log.debug("Reconciling Apicurio Registry: {}", primary);
 
         // Some of the fields in the CR have been deprecated and another fields should be used instead.
         // Operator will attempt to update the CR to use the newer fields if possible.
@@ -180,7 +138,7 @@ public UpdateControl<ApicurioRegistry3> reconcile(ApicurioRegistry3 primary,
 
     @Override
     public ErrorStatusUpdateControl<ApicurioRegistry3> updateErrorStatus(ApicurioRegistry3 apicurioRegistry,
-            Context<ApicurioRegistry3> context, Exception ex) {
+                                                                         Context<ApicurioRegistry3> context, Exception ex) {
         log.error("Status error", ex);
         var statusUpdater = new StatusUpdater(apicurioRegistry);
         statusUpdater.updateWithException(ex);

diff --git a/...oller/src/main/java/io/apicurio/registry/operator/resource/app/AppDeploymentResource.java b/...oller/src/main/java/io/apicurio/registry/operator/resource/app/AppDeploymentResource.java
@@ -120,7 +120,7 @@ protected Deployment desired(ApicurioRegistry3 primary, Context<ApicurioRegistry
         var container = getContainerFromDeployment(deployment, REGISTRY_APP_CONTAINER_NAME);
         container.setEnv(envVars.values().stream().toList());
 
-        log.debug("Desired {} is {}", APP_DEPLOYMENT_KEY.getId(), toYAML(deployment));
+        log.trace("Desired {} is {}", APP_DEPLOYMENT_KEY.getId(), toYAML(deployment));
         return deployment;
     }
 

diff --git a/...ntroller/src/main/java/io/apicurio/registry/operator/resource/app/AppIngressResource.java b/...ntroller/src/main/java/io/apicurio/registry/operator/resource/app/AppIngressResource.java
@@ -34,7 +34,7 @@ protected Ingress desired(ApicurioRegistry3 primary, Context<ApicurioRegistry3>
                 APP_SERVICE_KEY.getDiscriminator());
         sOpt.ifPresent(s -> withIngressRule(s, i, rule -> rule.setHost(getHost(COMPONENT_APP, primary))));
 
-        log.debug("Desired {} is {}", APP_INGRESS_KEY.getId(), toYAML(i));
+        log.trace("Desired {} is {}", APP_INGRESS_KEY.getId(), toYAML(i));
         return i;
     }
 }
diff --git a/...er/src/main/java/io/apicurio/registry/operator/resource/app/AppNetworkPolicyResource.java b/...er/src/main/java/io/apicurio/registry/operator/resource/app/AppNetworkPolicyResource.java
@@ -31,7 +31,7 @@ public AppNetworkPolicyResource() {
     @Override
     protected NetworkPolicy desired(ApicurioRegistry3 primary, Context<ApicurioRegistry3> context) {
         var networkPolicy = APP_NETWORK_POLICY_KEY.getFactory().apply(primary);
-        log.debug("Desired {} is {}", APP_NETWORK_POLICY_KEY.getId(), toYAML(networkPolicy));
+        log.trace("Desired {} is {}", APP_NETWORK_POLICY_KEY.getId(), toYAML(networkPolicy));
         return networkPolicy;
     }
 }
diff --git a/...ntroller/src/main/java/io/apicurio/registry/operator/resource/app/AppServiceResource.java b/...ntroller/src/main/java/io/apicurio/registry/operator/resource/app/AppServiceResource.java
@@ -24,7 +24,7 @@ public AppServiceResource() {
     @Override
     protected Service desired(ApicurioRegistry3 primary, Context<ApicurioRegistry3> context) {
         var s = APP_SERVICE_KEY.getFactory().apply(primary);
-        log.debug("Desired {} is {}", APP_SERVICE_KEY.getId(), toYAML(s));
+        log.trace("Desired {} is {}", APP_SERVICE_KEY.getId(), toYAML(s));
         return s;
     }
 }
diff --git a/...main/java/io/apicurio/registry/operator/resource/studioui/StudioUIDeploymentResource.java b/...main/java/io/apicurio/registry/operator/resource/studioui/StudioUIDeploymentResource.java
@@ -64,7 +64,7 @@ protected Deployment desired(ApicurioRegistry3 primary, Context<ApicurioRegistry
         var container = getContainerFromDeployment(d, STUDIO_UI_CONTAINER_NAME);
         container.setEnv(envVars.values().stream().toList());
 
-        log.debug("Desired {} is {}", STUDIO_UI_DEPLOYMENT_KEY.getId(), toYAML(d));
+        log.trace("Desired {} is {}", STUDIO_UI_DEPLOYMENT_KEY.getId(), toYAML(d));
         return d;
     }
 }
diff --git a/...rc/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIIngressResource.java b/...rc/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIIngressResource.java
@@ -35,7 +35,7 @@ protected Ingress desired(ApicurioRegistry3 primary, Context<ApicurioRegistry3>
         sOpt.ifPresent(
                 s -> withIngressRule(s, i, rule -> rule.setHost(getHost(COMPONENT_STUDIO_UI, primary))));
 
-        log.debug("Desired {} is {}", STUDIO_UI_INGRESS_KEY.getId(), toYAML(i));
+        log.trace("Desired {} is {}", STUDIO_UI_INGRESS_KEY.getId(), toYAML(i));
         return i;
     }
 }
diff --git a/...n/java/io/apicurio/registry/operator/resource/studioui/StudioUINetworkPolicyResource.java b/...n/java/io/apicurio/registry/operator/resource/studioui/StudioUINetworkPolicyResource.java
@@ -31,7 +31,7 @@ public StudioUINetworkPolicyResource() {
     @Override
     protected NetworkPolicy desired(ApicurioRegistry3 primary, Context<ApicurioRegistry3> context) {
         var networkPolicy = STUDIO_UI_NETWORK_POLICY_KEY.getFactory().apply(primary);
-        log.debug("Desired {} is {}", STUDIO_UI_NETWORK_POLICY_KEY.getId(), toYAML(networkPolicy));
+        log.trace("Desired {} is {}", STUDIO_UI_NETWORK_POLICY_KEY.getId(), toYAML(networkPolicy));
         return networkPolicy;
     }
 }
diff --git a/...rc/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIServiceResource.java b/...rc/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIServiceResource.java
@@ -24,7 +24,7 @@ public StudioUIServiceResource() {
     @Override
     protected Service desired(ApicurioRegistry3 primary, Context<ApicurioRegistry3> context) {
         var s = STUDIO_UI_SERVICE_KEY.getFactory().apply(primary);
-        log.debug("Desired {} is {}", STUDIO_UI_SERVICE_KEY.getId(), toYAML(s));
+        log.trace("Desired {} is {}", STUDIO_UI_SERVICE_KEY.getId(), toYAML(s));
         return s;
     }
 }
diff --git a/...troller/src/main/java/io/apicurio/registry/operator/resource/ui/UIDeploymentResource.java b/...troller/src/main/java/io/apicurio/registry/operator/resource/ui/UIDeploymentResource.java
@@ -54,7 +54,7 @@ protected Deployment desired(ApicurioRegistry3 primary, Context<ApicurioRegistry
         var container = getContainerFromDeployment(d, REGISTRY_UI_CONTAINER_NAME);
         container.setEnv(envVars.values().stream().toList());
 
-        log.debug("Desired {} is {}", UI_DEPLOYMENT_KEY.getId(), toYAML(d));
+        log.trace("Desired {} is {}", UI_DEPLOYMENT_KEY.getId(), toYAML(d));
         return d;
     }
 }
diff --git a/...controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIIngressResource.java b/...controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIIngressResource.java
@@ -33,7 +33,7 @@ protected Ingress desired(ApicurioRegistry3 primary, Context<ApicurioRegistry3>
         var sOpt = context.getSecondaryResource(UI_SERVICE_KEY.getKlass(), UI_SERVICE_KEY.getDiscriminator());
         sOpt.ifPresent(s -> withIngressRule(s, i, rule -> rule.setHost(getHost(COMPONENT_UI, primary))));
 
-        log.debug("Desired {} is {}", UI_INGRESS_KEY.getId(), toYAML(i));
+        log.trace("Desired {} is {}", UI_INGRESS_KEY.getId(), toYAML(i));
         return i;
     }
 }
diff --git a/...ller/src/main/java/io/apicurio/registry/operator/resource/ui/UINetworkPolicyResource.java b/...ller/src/main/java/io/apicurio/registry/operator/resource/ui/UINetworkPolicyResource.java
@@ -31,7 +31,7 @@ public UINetworkPolicyResource() {
     @Override
     protected NetworkPolicy desired(ApicurioRegistry3 primary, Context<ApicurioRegistry3> context) {
         var networkPolicy = UI_NETWORK_POLICY_KEY.getFactory().apply(primary);
-        log.debug("Desired {} is {}", UI_NETWORK_POLICY_KEY.getId(), toYAML(networkPolicy));
+        log.trace("Desired {} is {}", UI_NETWORK_POLICY_KEY.getId(), toYAML(networkPolicy));
         return networkPolicy;
     }
 }
diff --git a/...controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIServiceResource.java b/...controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIServiceResource.java
@@ -24,7 +24,7 @@ public UIServiceResource() {
     @Override
     protected Service desired(ApicurioRegistry3 primary, Context<ApicurioRegistry3> context) {
         var s = UI_SERVICE_KEY.getFactory().apply(primary);
-        log.debug("Desired {} is {}", UI_SERVICE_KEY.getId(), toYAML(s));
+        log.trace("Desired {} is {}", UI_SERVICE_KEY.getId(), toYAML(s));
         return s;
     }
 }
diff --git a/operator/controller/src/main/resources/application.properties b/operator/controller/src/main/resources/application.properties
@@ -7,13 +7,11 @@ quarkus.log.level=info
 %dev.quarkus.log.level=info
 %test.quarkus.log.level=info
 
-apicurio.log.level=info
-%dev.apicurio.log.level=debug
-%test.apicurio.log.level=debug
+quarkus.log.category."io.apicurio".min-level=trace
 
-quarkus.log.category."io.apicurio".level=${apicurio.log.level}
-%dev.quarkus.log.category."io.apicurio".level=${%dev.apicurio.log.level}
-%test.quarkus.log.category."io.apicurio".level=${%test.apicurio.log.level}
+quarkus.log.category."io.apicurio".level=info
+%dev.quarkus.log.category."io.apicurio".level=trace
+%test.quarkus.log.category."io.apicurio".level=debug
 
 quarkus.log.console.enable=true
 quarkus.log.console.format=%d{YYYY-MM-dd HH:mm:ss} %p [%C] (%t) %m%n