task: move files and organize them (#48)

trustification · Dec 4, 2024 · cb866a3 · cb866a3
1 parent debf50b
commit cb866a3
Show file tree

Hide file tree

Showing 33 changed files with 81 additions and 72 deletions.
diff --git a/.../operator/cdrs/v2alpha1/ui/UIIngress.java → ...tor/cdrs/v2alpha1/ingress/AppIngress.java b/.../operator/cdrs/v2alpha1/ui/UIIngress.java → ...tor/cdrs/v2alpha1/ingress/AppIngress.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.ui;
+package org.trustify.operator.cdrs.v2alpha1.ingress;
 
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.fabric8.kubernetes.api.model.networking.v1.IngressTLS;
@@ -15,9 +15,9 @@
 import java.util.Collections;
 import java.util.Map;
 
-@KubernetesDependent(labelSelector = UIIngress.LABEL_SELECTOR, resourceDiscriminator = UIIngressDiscriminator.class)
+@KubernetesDependent(labelSelector = AppIngress.LABEL_SELECTOR, resourceDiscriminator = AppIngressDiscriminator.class)
 @ApplicationScoped
-public class UIIngress extends UIIngressBase {
+public class AppIngress extends AppIngressBase {
 
     public static final String LABEL_SELECTOR = "app.kubernetes.io/managed-by=trustify-operator,component=ui,component-variant=https";
 
@@ -38,7 +38,7 @@ protected Ingress desired(Trustify cr, Context<Trustify> context) {
 
     @Override
     public boolean isMet(DependentResource<Ingress, Trustify> dependentResource, Trustify primary, Context<Trustify> context) {
-        return context.getSecondaryResource(Ingress.class, new UIIngressDiscriminator())
+        return context.getSecondaryResource(Ingress.class, new AppIngressDiscriminator())
                 .map(in -> {
                     final var status = in.getStatus();
                     if (status != null) {

diff --git a/...rator/cdrs/v2alpha1/ui/UIIngressBase.java → ...cdrs/v2alpha1/ingress/AppIngressBase.java b/...rator/cdrs/v2alpha1/ui/UIIngressBase.java → ...cdrs/v2alpha1/ingress/AppIngressBase.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.ui;
+package org.trustify.operator.cdrs.v2alpha1.ingress;
 
 import io.fabric8.kubernetes.api.model.GenericKubernetesResource;
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
@@ -14,19 +14,20 @@
 import jakarta.inject.Inject;
 import org.trustify.operator.Constants;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
+import org.trustify.operator.cdrs.v2alpha1.ui.service.UIService;
 import org.trustify.operator.utils.CRDUtils;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
-public abstract class UIIngressBase extends CRUDKubernetesDependentResource<Ingress, Trustify> implements Condition<Ingress, Trustify> {
+public abstract class AppIngressBase extends CRUDKubernetesDependentResource<Ingress, Trustify> implements Condition<Ingress, Trustify> {
 
     @Inject
     KubernetesClient k8sClient;
 
-    public UIIngressBase() {
+    public AppIngressBase() {
         super(Ingress.class);
     }
 

diff --git a/...s/v2alpha1/ui/UIIngressDiscriminator.java → ...pha1/ingress/AppIngressDiscriminator.java b/...s/v2alpha1/ui/UIIngressDiscriminator.java → ...pha1/ingress/AppIngressDiscriminator.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.ui;
+package org.trustify.operator.cdrs.v2alpha1.ingress;
 
 import io.fabric8.kubernetes.api.model.networking.v1.Ingress;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
@@ -9,10 +9,10 @@
 
 import java.util.Optional;
 
-public class UIIngressDiscriminator implements ResourceDiscriminator<Ingress, Trustify> {
+public class AppIngressDiscriminator implements ResourceDiscriminator<Ingress, Trustify> {
     @Override
     public Optional<Ingress> distinguish(Class<Ingress> resource, Trustify cr, Context<Trustify> context) {
-        String ingressName = UIIngress.getIngressName(cr);
+        String ingressName = AppIngress.getIngressName(cr);
         ResourceID resourceID = new ResourceID(ingressName, cr.getMetadata().getNamespace());
         var informerEventSource = (InformerEventSource<Ingress, Trustify>) context.eventSourceRetriever().getResourceEventSourceFor(Ingress.class);
         return informerEventSource.get(resourceID);

diff --git a/...rs/v2alpha1/db/DBActivationCondition.java → ...pha1/server/db/DBActivationCondition.java b/...rs/v2alpha1/db/DBActivationCondition.java → ...pha1/server/db/DBActivationCondition.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.db;
+package org.trustify.operator.cdrs.v2alpha1.server.db;
 
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
 import org.trustify.operator.cdrs.v2alpha1.server.utils.ServerUtils;

diff --git a/...erator/cdrs/v2alpha1/db/DBDeployment.java → ...a1/server/db/deployment/DBDeployment.java b/...erator/cdrs/v2alpha1/db/DBDeployment.java → ...a1/server/db/deployment/DBDeployment.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.db;
+package org.trustify.operator.cdrs.v2alpha1.server.db.deployment;
 
 import io.fabric8.kubernetes.api.model.*;
 import io.fabric8.kubernetes.api.model.apps.*;
@@ -14,7 +14,9 @@
 import org.trustify.operator.Constants;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
 import org.trustify.operator.cdrs.v2alpha1.TrustifySpec;
-import org.trustify.operator.cdrs.v2alpha1.db.utils.DBUtils;
+import org.trustify.operator.cdrs.v2alpha1.server.db.pvc.DBPersistentVolumeClaim;
+import org.trustify.operator.cdrs.v2alpha1.server.db.secret.DBSecret;
+import org.trustify.operator.cdrs.v2alpha1.server.db.utils.DBUtils;
 import org.trustify.operator.utils.CRDUtils;
 
 import java.util.Arrays;

diff --git a/...1/db/DBDeploymentActivationCondition.java → ...ment/DBDeploymentActivationCondition.java b/...1/db/DBDeploymentActivationCondition.java → ...ment/DBDeploymentActivationCondition.java
@@ -1,11 +1,12 @@
-package org.trustify.operator.cdrs.v2alpha1.db;
+package org.trustify.operator.cdrs.v2alpha1.server.db.deployment;
 
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
 import jakarta.enterprise.context.ApplicationScoped;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
+import org.trustify.operator.cdrs.v2alpha1.server.db.DBActivationCondition;
 
 @ApplicationScoped
 public class DBDeploymentActivationCondition extends DBActivationCondition implements Condition<Deployment, Trustify> {

diff --git a/...2alpha1/db/DBDeploymentDiscriminator.java → ...deployment/DBDeploymentDiscriminator.java b/...2alpha1/db/DBDeploymentDiscriminator.java → ...deployment/DBDeploymentDiscriminator.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.db;
+package org.trustify.operator.cdrs.v2alpha1.server.db.deployment;
 
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/.../v2alpha1/db/DBPersistentVolumeClaim.java → ...erver/db/pvc/DBPersistentVolumeClaim.java b/.../v2alpha1/db/DBPersistentVolumeClaim.java → ...erver/db/pvc/DBPersistentVolumeClaim.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.db;
+package org.trustify.operator.cdrs.v2alpha1.server.db.pvc;
 
 import io.fabric8.kubernetes.api.model.*;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/...istentVolumeClaimActivationCondition.java → ...istentVolumeClaimActivationCondition.java b/...istentVolumeClaimActivationCondition.java → ...istentVolumeClaimActivationCondition.java
@@ -1,11 +1,12 @@
-package org.trustify.operator.cdrs.v2alpha1.db;
+package org.trustify.operator.cdrs.v2alpha1.server.db.pvc;
 
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
 import jakarta.enterprise.context.ApplicationScoped;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
+import org.trustify.operator.cdrs.v2alpha1.server.db.DBActivationCondition;
 
 @ApplicationScoped
 public class DBPersistentVolumeClaimActivationCondition extends DBActivationCondition implements Condition<PersistentVolumeClaim, Trustify> {

diff --git a/...DBPersistentVolumeClaimDiscriminator.java → ...DBPersistentVolumeClaimDiscriminator.java b/...DBPersistentVolumeClaimDiscriminator.java → ...DBPersistentVolumeClaimDiscriminator.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.db;
+package org.trustify.operator.cdrs.v2alpha1.server.db.pvc;
 
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/...y/operator/cdrs/v2alpha1/db/DBSecret.java → ...s/v2alpha1/server/db/secret/DBSecret.java b/...y/operator/cdrs/v2alpha1/db/DBSecret.java → ...s/v2alpha1/server/db/secret/DBSecret.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.db;
+package org.trustify.operator.cdrs.v2alpha1.server.db.secret;
 
 import io.fabric8.kubernetes.api.model.Secret;
 import io.fabric8.kubernetes.api.model.SecretBuilder;

diff --git a/...lpha1/db/DBSecretActivationCondition.java → ...b/secret/DBSecretActivationCondition.java b/...lpha1/db/DBSecretActivationCondition.java → ...b/secret/DBSecretActivationCondition.java
@@ -1,11 +1,12 @@
-package org.trustify.operator.cdrs.v2alpha1.db;
+package org.trustify.operator.cdrs.v2alpha1.server.db.secret;
 
 import io.fabric8.kubernetes.api.model.Secret;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
 import jakarta.enterprise.context.ApplicationScoped;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
+import org.trustify.operator.cdrs.v2alpha1.server.db.DBActivationCondition;
 
 import java.util.Optional;
 

diff --git a/...rs/v2alpha1/db/DBSecretDiscriminator.java → ...rver/db/secret/DBSecretDiscriminator.java b/...rs/v2alpha1/db/DBSecretDiscriminator.java → ...rver/db/secret/DBSecretDiscriminator.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.db;
+package org.trustify.operator.cdrs.v2alpha1.server.db.secret;
 
 import io.fabric8.kubernetes.api.model.Secret;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/.../operator/cdrs/v2alpha1/db/DBService.java → ...v2alpha1/server/db/service/DBService.java b/.../operator/cdrs/v2alpha1/db/DBService.java → ...v2alpha1/server/db/service/DBService.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.db;
+package org.trustify.operator.cdrs.v2alpha1.server.db.service;
 
 import io.fabric8.kubernetes.api.model.Service;
 import io.fabric8.kubernetes.api.model.ServiceBuilder;
@@ -10,6 +10,7 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import org.trustify.operator.Constants;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
+import org.trustify.operator.cdrs.v2alpha1.server.db.deployment.DBDeployment;
 import org.trustify.operator.utils.CRDUtils;
 
 import java.util.Map;

diff --git a/...pha1/db/DBServiceActivationCondition.java → ...service/DBServiceActivationCondition.java b/...pha1/db/DBServiceActivationCondition.java → ...service/DBServiceActivationCondition.java
@@ -1,11 +1,12 @@
-package org.trustify.operator.cdrs.v2alpha1.db;
+package org.trustify.operator.cdrs.v2alpha1.server.db.service;
 
 import io.fabric8.kubernetes.api.model.Service;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.workflow.Condition;
 import jakarta.enterprise.context.ApplicationScoped;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
+import org.trustify.operator.cdrs.v2alpha1.server.db.DBActivationCondition;
 
 @ApplicationScoped
 public class DBServiceActivationCondition extends DBActivationCondition implements Condition<Service, Trustify> {

diff --git a/...s/v2alpha1/db/DBServiceDiscriminator.java → ...er/db/service/DBServiceDiscriminator.java b/...s/v2alpha1/db/DBServiceDiscriminator.java → ...er/db/service/DBServiceDiscriminator.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.db;
+package org.trustify.operator.cdrs.v2alpha1.server.db.service;
 
 import io.fabric8.kubernetes.api.model.Service;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/...rator/cdrs/v2alpha1/db/utils/DBUtils.java → ...drs/v2alpha1/server/db/utils/DBUtils.java b/...rator/cdrs/v2alpha1/db/utils/DBUtils.java → ...drs/v2alpha1/server/db/utils/DBUtils.java
@@ -1,10 +1,10 @@
-package org.trustify.operator.cdrs.v2alpha1.db.utils;
+package org.trustify.operator.cdrs.v2alpha1.server.db.utils;
 
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
-import org.trustify.operator.cdrs.v2alpha1.db.DBDeploymentDiscriminator;
+import org.trustify.operator.cdrs.v2alpha1.server.db.deployment.DBDeploymentDiscriminator;
 
 public class DBUtils {
 

diff --git a/...drs/v2alpha1/server/ServerDeployment.java → ...1/server/deployment/ServerDeployment.java b/...drs/v2alpha1/server/ServerDeployment.java → ...1/server/deployment/ServerDeployment.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.server;
+package org.trustify.operator.cdrs.v2alpha1.server.deployment;
 
 import io.fabric8.kubernetes.api.model.*;
 import io.fabric8.kubernetes.api.model.apps.*;
@@ -14,7 +14,7 @@
 import org.trustify.operator.Constants;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
 import org.trustify.operator.cdrs.v2alpha1.TrustifySpec;
-import org.trustify.operator.cdrs.v2alpha1.db.DBDeployment;
+import org.trustify.operator.cdrs.v2alpha1.server.db.deployment.DBDeployment;
 import org.trustify.operator.controllers.TrustifyDistConfigurator;
 import org.trustify.operator.utils.CRDUtils;
 

diff --git a/...server/ServerDeploymentDiscriminator.java → ...oyment/ServerDeploymentDiscriminator.java b/...server/ServerDeploymentDiscriminator.java → ...oyment/ServerDeploymentDiscriminator.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.server;
+package org.trustify.operator.cdrs.v2alpha1.server.deployment;
 
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/...r/ServerStoragePersistentVolumeClaim.java → ...c/ServerStoragePersistentVolumeClaim.java b/...r/ServerStoragePersistentVolumeClaim.java → ...c/ServerStoragePersistentVolumeClaim.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.server;
+package org.trustify.operator.cdrs.v2alpha1.server.pvc;
 
 import io.fabric8.kubernetes.api.model.*;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/...istentVolumeClaimActivationCondition.java → ...istentVolumeClaimActivationCondition.java b/...istentVolumeClaimActivationCondition.java → ...istentVolumeClaimActivationCondition.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.server;
+package org.trustify.operator.cdrs.v2alpha1.server.pvc;
 
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/...gePersistentVolumeClaimDiscriminator.java → ...gePersistentVolumeClaimDiscriminator.java b/...gePersistentVolumeClaimDiscriminator.java → ...gePersistentVolumeClaimDiscriminator.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.server;
+package org.trustify.operator.cdrs.v2alpha1.server.pvc;
 
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/...r/cdrs/v2alpha1/server/ServerService.java → ...2alpha1/server/service/ServerService.java b/...r/cdrs/v2alpha1/server/ServerService.java → ...2alpha1/server/service/ServerService.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.server;
+package org.trustify.operator.cdrs.v2alpha1.server.service;
 
 import io.fabric8.kubernetes.api.model.*;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/...a1/server/ServerServiceDiscriminator.java → ...r/service/ServerServiceDiscriminator.java b/...a1/server/ServerServiceDiscriminator.java → ...r/service/ServerServiceDiscriminator.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.server;
+package org.trustify.operator.cdrs.v2alpha1.server.service;
 
 import io.fabric8.kubernetes.api.model.Service;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/...erator/cdrs/v2alpha1/ui/UIDeployment.java → .../v2alpha1/ui/deployment/UIDeployment.java b/...erator/cdrs/v2alpha1/ui/UIDeployment.java → .../v2alpha1/ui/deployment/UIDeployment.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.ui;
+package org.trustify.operator.cdrs.v2alpha1.ui.deployment;
 
 import io.fabric8.kubernetes.api.model.*;
 import io.fabric8.kubernetes.api.model.apps.*;
@@ -14,8 +14,8 @@
 import org.trustify.operator.Constants;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
 import org.trustify.operator.cdrs.v2alpha1.TrustifySpec;
-import org.trustify.operator.cdrs.v2alpha1.server.ServerDeployment;
-import org.trustify.operator.cdrs.v2alpha1.server.ServerService;
+import org.trustify.operator.cdrs.v2alpha1.server.deployment.ServerDeployment;
+import org.trustify.operator.cdrs.v2alpha1.server.service.ServerService;
 import org.trustify.operator.utils.CRDUtils;
 
 import java.util.Arrays;

diff --git a/...2alpha1/ui/UIDeploymentDiscriminator.java → ...deployment/UIDeploymentDiscriminator.java b/...2alpha1/ui/UIDeploymentDiscriminator.java → ...deployment/UIDeploymentDiscriminator.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.ui;
+package org.trustify.operator.cdrs.v2alpha1.ui.deployment;
 
 import io.fabric8.kubernetes.api.model.apps.Deployment;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/.../operator/cdrs/v2alpha1/ui/UIService.java → ...r/cdrs/v2alpha1/ui/service/UIService.java b/.../operator/cdrs/v2alpha1/ui/UIService.java → ...r/cdrs/v2alpha1/ui/service/UIService.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.ui;
+package org.trustify.operator.cdrs.v2alpha1.ui.service;
 
 import io.fabric8.kubernetes.api.model.*;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/...s/v2alpha1/ui/UIServiceDiscriminator.java → ...a1/ui/service/UIServiceDiscriminator.java b/...s/v2alpha1/ui/UIServiceDiscriminator.java → ...a1/ui/service/UIServiceDiscriminator.java
@@ -1,4 +1,4 @@
-package org.trustify.operator.cdrs.v2alpha1.ui;
+package org.trustify.operator.cdrs.v2alpha1.ui.service;
 
 import io.fabric8.kubernetes.api.model.Service;
 import io.javaoperatorsdk.operator.api.reconciler.Context;

diff --git a/src/main/java/org/trustify/operator/controllers/TrustifyDistConfigurator.java b/src/main/java/org/trustify/operator/controllers/TrustifyDistConfigurator.java
@@ -5,10 +5,10 @@
 import org.trustify.operator.Constants;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
 import org.trustify.operator.cdrs.v2alpha1.TrustifySpec;
-import org.trustify.operator.cdrs.v2alpha1.db.DBDeployment;
-import org.trustify.operator.cdrs.v2alpha1.db.DBService;
-import org.trustify.operator.cdrs.v2alpha1.server.ServerService;
-import org.trustify.operator.cdrs.v2alpha1.server.ServerStoragePersistentVolumeClaim;
+import org.trustify.operator.cdrs.v2alpha1.server.db.deployment.DBDeployment;
+import org.trustify.operator.cdrs.v2alpha1.server.db.service.DBService;
+import org.trustify.operator.cdrs.v2alpha1.server.service.ServerService;
+import org.trustify.operator.cdrs.v2alpha1.server.pvc.ServerStoragePersistentVolumeClaim;
 
 import java.util.*;
 import java.util.function.Function;

diff --git a/src/main/java/org/trustify/operator/controllers/TrustifyReconciler.java b/src/main/java/org/trustify/operator/controllers/TrustifyReconciler.java
@@ -13,14 +13,21 @@
 import org.jboss.logging.Logger;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
 import org.trustify.operator.cdrs.v2alpha1.TrustifyStatusCondition;
-import org.trustify.operator.cdrs.v2alpha1.db.*;
-import org.trustify.operator.cdrs.v2alpha1.server.ServerDeployment;
-import org.trustify.operator.cdrs.v2alpha1.server.ServerService;
-import org.trustify.operator.cdrs.v2alpha1.server.ServerStoragePersistentVolumeClaim;
-import org.trustify.operator.cdrs.v2alpha1.server.ServerStoragePersistentVolumeClaimActivationCondition;
-import org.trustify.operator.cdrs.v2alpha1.ui.UIDeployment;
-import org.trustify.operator.cdrs.v2alpha1.ui.UIIngress;
-import org.trustify.operator.cdrs.v2alpha1.ui.UIService;
+import org.trustify.operator.cdrs.v2alpha1.server.deployment.ServerDeployment;
+import org.trustify.operator.cdrs.v2alpha1.server.service.ServerService;
+import org.trustify.operator.cdrs.v2alpha1.server.pvc.ServerStoragePersistentVolumeClaim;
+import org.trustify.operator.cdrs.v2alpha1.server.pvc.ServerStoragePersistentVolumeClaimActivationCondition;
+import org.trustify.operator.cdrs.v2alpha1.server.db.deployment.DBDeployment;
+import org.trustify.operator.cdrs.v2alpha1.server.db.deployment.DBDeploymentActivationCondition;
+import org.trustify.operator.cdrs.v2alpha1.server.db.pvc.DBPersistentVolumeClaim;
+import org.trustify.operator.cdrs.v2alpha1.server.db.pvc.DBPersistentVolumeClaimActivationCondition;
+import org.trustify.operator.cdrs.v2alpha1.server.db.secret.DBSecret;
+import org.trustify.operator.cdrs.v2alpha1.server.db.secret.DBSecretActivationCondition;
+import org.trustify.operator.cdrs.v2alpha1.server.db.service.DBService;
+import org.trustify.operator.cdrs.v2alpha1.server.db.service.DBServiceActivationCondition;
+import org.trustify.operator.cdrs.v2alpha1.ui.deployment.UIDeployment;
+import org.trustify.operator.cdrs.v2alpha1.ingress.AppIngress;
+import org.trustify.operator.cdrs.v2alpha1.ui.service.UIService;
 
 import java.time.Duration;
 import java.util.Map;
@@ -80,9 +87,9 @@
                 ),
 
                 @Dependent(
-                        name = "ui-ingress",
-                        type = UIIngress.class,
-                        readyPostcondition = UIIngress.class
+                        name = "app-ingress",
+                        type = AppIngress.class,
+                        readyPostcondition = AppIngress.class
                 )
         }
 )

diff --git a/src/test/java/org/trustify/operator/controllers/DatabaseSpecTest.java b/src/test/java/org/trustify/operator/controllers/DatabaseSpecTest.java
@@ -10,7 +10,7 @@
 import org.junit.jupiter.api.Test;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
 import org.trustify.operator.cdrs.v2alpha1.TrustifySpec;
-import org.trustify.operator.cdrs.v2alpha1.db.DBDeployment;
+import org.trustify.operator.cdrs.v2alpha1.server.db.deployment.DBDeployment;
 import org.trustify.operator.controllers.setup.K3sResource;
 
 import java.io.InputStream;