diff --git a/operator/controller/src/main/java/io/apicurio/registry/operator/ApicurioRegistry3Reconciler.java b/operator/controller/src/main/java/io/apicurio/registry/operator/ApicurioRegistry3Reconciler.java index e157a92fc5..ed6f7aa9d7 100644 --- a/operator/controller/src/main/java/io/apicurio/registry/operator/ApicurioRegistry3Reconciler.java +++ b/operator/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 reconcile(ApicurioRegistry3 primary, - Context context) { + Context 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 reconcile(ApicurioRegistry3 primary, @Override public ErrorStatusUpdateControl updateErrorStatus(ApicurioRegistry3 apicurioRegistry, - Context context, Exception ex) { + Context context, Exception ex) { log.error("Status error", ex); var statusUpdater = new StatusUpdater(apicurioRegistry); statusUpdater.updateWithException(ex); diff --git a/operator/controller/src/main/java/io/apicurio/registry/operator/resource/app/AppDeploymentResource.java b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/app/AppDeploymentResource.java index 4d4a70c10a..27206cafdd 100644 --- a/operator/controller/src/main/java/io/apicurio/registry/operator/resource/app/AppDeploymentResource.java +++ b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/app/AppDeploymentResource.java @@ -120,7 +120,7 @@ protected Deployment desired(ApicurioRegistry3 primary, Context 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/operator/controller/src/main/java/io/apicurio/registry/operator/resource/app/AppNetworkPolicyResource.java b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/app/AppNetworkPolicyResource.java index 8514070499..62ec1339e4 100644 --- a/operator/controller/src/main/java/io/apicurio/registry/operator/resource/app/AppNetworkPolicyResource.java +++ b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/app/AppNetworkPolicyResource.java @@ -31,7 +31,7 @@ public AppNetworkPolicyResource() { @Override protected NetworkPolicy desired(ApicurioRegistry3 primary, Context 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/operator/controller/src/main/java/io/apicurio/registry/operator/resource/app/AppServiceResource.java b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/app/AppServiceResource.java index d0be4ada00..09b103bf08 100644 --- a/operator/controller/src/main/java/io/apicurio/registry/operator/resource/app/AppServiceResource.java +++ b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/app/AppServiceResource.java @@ -24,7 +24,7 @@ public AppServiceResource() { @Override protected Service desired(ApicurioRegistry3 primary, Context 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/operator/controller/src/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIDeploymentResource.java b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIDeploymentResource.java index 854cdbaf76..d771e49139 100644 --- a/operator/controller/src/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIDeploymentResource.java +++ b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIDeploymentResource.java @@ -64,7 +64,7 @@ protected Deployment desired(ApicurioRegistry3 primary, Context 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/operator/controller/src/main/java/io/apicurio/registry/operator/resource/studioui/StudioUINetworkPolicyResource.java b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/studioui/StudioUINetworkPolicyResource.java index efc19eb123..9455bc9e71 100644 --- a/operator/controller/src/main/java/io/apicurio/registry/operator/resource/studioui/StudioUINetworkPolicyResource.java +++ b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/studioui/StudioUINetworkPolicyResource.java @@ -31,7 +31,7 @@ public StudioUINetworkPolicyResource() { @Override protected NetworkPolicy desired(ApicurioRegistry3 primary, Context 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/operator/controller/src/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIServiceResource.java b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIServiceResource.java index b34f4658ed..3603880533 100644 --- a/operator/controller/src/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIServiceResource.java +++ b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/studioui/StudioUIServiceResource.java @@ -24,7 +24,7 @@ public StudioUIServiceResource() { @Override protected Service desired(ApicurioRegistry3 primary, Context 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/operator/controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIDeploymentResource.java b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIDeploymentResource.java index fb1ca16f81..aaa1f6f7ed 100644 --- a/operator/controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIDeploymentResource.java +++ b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIDeploymentResource.java @@ -54,7 +54,7 @@ protected Deployment desired(ApicurioRegistry3 primary, Context 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/operator/controller/src/main/java/io/apicurio/registry/operator/resource/ui/UINetworkPolicyResource.java b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/ui/UINetworkPolicyResource.java index 20310dee65..4a26261305 100644 --- a/operator/controller/src/main/java/io/apicurio/registry/operator/resource/ui/UINetworkPolicyResource.java +++ b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/ui/UINetworkPolicyResource.java @@ -31,7 +31,7 @@ public UINetworkPolicyResource() { @Override protected NetworkPolicy desired(ApicurioRegistry3 primary, Context 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/operator/controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIServiceResource.java b/operator/controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIServiceResource.java index 2b330c36c3..6e2c0c7afb 100644 --- a/operator/controller/src/main/java/io/apicurio/registry/operator/resource/ui/UIServiceResource.java +++ b/operator/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 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 index b87e7205aa..1060204061 100644 --- 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