task: add tests and move DB conditions into a single util (#47)

Author: carlosthe19916

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        preset: [ "okd" ]
+        preset: [ "openshift", "microshift" ]
       fail-fast: false
     steps:
       - uses: actions/checkout@v4
@@ -74,22 +74,31 @@ jobs:
           df -h
       - name: Download crc
         run: |
-          wget https://developers.redhat.com/content-gateway/file/pub/openshift-v4/clients/crc/2.40.0/crc-linux-amd64.tar.xz
+          wget https://developers.redhat.com/content-gateway/file/pub/openshift-v4/clients/crc/2.44.0/crc-linux-amd64.tar.xz
           mkdir -p bin/ && tar -xJf crc-linux-amd64.tar.xz --strip-components=1 -C bin/
           sudo mv ./bin/crc /usr/local/bin/crc && rm -r bin/
       - name: Set the crc config
         run: |
-          crc config set consent-telemetry no
-          crc config set network-mode user
+          echo eyJhdXRocyI6eyJjbG91ZC5vcGVuc2hpZnQuY29tIjp7ImF1dGgiOiJiM0JsYm5Ob2FXWjBMWEpsYkdWaGMyVXRaR1YySzI5amJWOWhZMk5sYzNOZk16RTFaRE16TWpJM09HVXpOR000WTJKbFkyVmxOMlU0TVRoa1pEazNNRGc2VERKSldUVlVUVlZQUTA5VlRraFdTRTFRUjBaRFdEaFBTRUpVTVVaU1RrZEtOMU5EUVZFMlFrOUlPRWRHVERjMVVFeE9UVTB5VFRsUldFZzFSbGMyT1E9PSIsImVtYWlsIjoidHJ1c3QuZ2l0LmJvdEBnbWFpbC5jb20ifSwicXVheS5pbyI6eyJhdXRoIjoiYjNCbGJuTm9hV1owTFhKbGJHVmhjMlV0WkdWMksyOWpiVjloWTJObGMzTmZNekUxWkRNek1qSTNPR1V6TkdNNFkySmxZMlZsTjJVNE1UaGtaRGszTURnNlRESkpXVFZVVFZWUFEwOVZUa2hXU0UxUVIwWkRXRGhQU0VKVU1VWlNUa2RLTjFORFFWRTJRazlJT0VkR1REYzFVRXhPVFUweVRUbFJXRWcxUmxjMk9RPT0iLCJlbWFpbCI6InRydXN0LmdpdC5ib3RAZ21haWwuY29tIn0sInJlZ2lzdHJ5LmNvbm5lY3QucmVkaGF0LmNvbSI6eyJhdXRoIjoiZkhWb1l5MXdiMjlzTFRSak9HTTVOREV5TFRJeFltRXROREUxWmkwNU5UQmxMVEk1TXpWak9HRXhPREk1TmpwbGVVcG9Za2RqYVU5cFNsTlZlbFY0VFdsS09TNWxlVXA2WkZkSmFVOXBTbXhPYWxGNldsUlZNVTFIUlRKT1YwVXdUVEpKTlU5VWFHcFpiVlpzV2tSb2JFMUhSbXhOYW1oc1drTktPUzVuVVRWV05EZHNUalo1U0RCNFFWSnlSRkJPTVhKbFUwNHhTblJaY1ZwdWNqaHJaalZHYkhJd1RWZzNURTFuUTNWSVRqbENRemxDZUc5UFkzQmxhRmgwWTJ0WmFEZE1TMDFKTmpsb1UyVk1jbmRQTFRGT2MwWldhbWxtVUU5QlptRkxUSEl3ZURGeFN5MXZVa0pwWlRKRk0zRlRhRE5YWVVjNGFVOWpkVWR1U0haTlEzWm1NQzExZUZoMmRWRmxiM0o2WDFNM1dHWmFZbGRITW0xWFZFeHNia1JqVlVwb1ptUjRTa1Z3YUdaMllubzFWMEV3V1dJelpGSjFObk5WY1dZNFpFdExUVVkwVlZBNVlUQnVSVk5uUm01cWFtSm1lWEF4VmpkTWFXUkdXR2wwT0hkTlpVeFdkMVJCYkdOSVkwMURRMUpwVW05bU5tUndOMjVyUldnMWNtdENWWGR5Tms1SlVVMXpWWE4xYTAxMlpFVktWVU51TkVKcExVaGtNR2hGUjJkRVp6UnlkamxIWldWNFowMTBhbFJaT0dvelVGTlpRV3hUVFVsVFdteERXVWg0WDBrMWVuRlpPWEV4ZW10aWRtOHpVM0pJY1dWeGRXNXNha3BwUkRCVVdEbGxhVmxyUTJzeldWOXhTbVJOVDBkM1NHVm1OMmx3YlhjMVdsbG5OeTB4WWxVeWFUTXpVMkp1UWtJdFpGQjBValYwYTFJeVEyVlJWVEZTTW1aVVkxQk1lbUZqWWtkcWRrUjJUMmx2ZVhCbmRqVm9abGd4Y1RWelFqTjBWVE5tYnpaMVV6bERlV3BVYVdSd1owTk1NVXBwUkU1T1FraFhRVU54WkVvM09GaG9VM0ZyVDBWRGJFbEtNRlI1V2xock5uVTBSREJ4YzFGVmEzbFFkMHQwWlU5aGRGbGhMVkpITVRKZlIwMUNNSEZIYWtWSGRIbDZaVEpIYzNSd2RsOTZUMlZOYTJSMFEzbEhWMmQ0ZG1GZlJWTlBNVkpJWkVWR1IwWTNhVGt0YmtVemQwSlJYMjE1ZVhaeU1IVlNWVlJUVFZKeE1YY3paRGxoU1V0eldYTnhaRWR1ZWxGMWNYUktWVkJhVGkxRVRFTnhRME53UWtSclpuRkJWbDh3UVhWUVZreGhOa1pWYW1KYVFUTnJURGsyVFZOdkxWaHlVMXAwTVRaNU5GZDNNMlp0YmkxMFVsOVdRUT09IiwiZW1haWwiOiJ0cnVzdC5naXQuYm90QGdtYWlsLmNvbSJ9LCJyZWdpc3RyeS5yZWRoYXQuaW8iOnsiYXV0aCI6ImZIVm9ZeTF3YjI5c0xUUmpPR001TkRFeUxUSXhZbUV0TkRFMVppMDVOVEJsTFRJNU16VmpPR0V4T0RJNU5qcGxlVXBvWWtkamFVOXBTbE5WZWxWNFRXbEtPUzVsZVVwNlpGZEphVTlwU214T2FsRjZXbFJWTVUxSFJUSk9WMFV3VFRKSk5VOVVhR3BaYlZac1drUm9iRTFIUm14TmFtaHNXa05LT1M1blVUVldORGRzVGpaNVNEQjRRVkp5UkZCT01YSmxVMDR4U25SWmNWcHVjamhyWmpWR2JISXdUVmczVEUxblEzVklUamxDUXpsQ2VHOVBZM0JsYUZoMFkydFphRGRNUzAxSk5qbG9VMlZNY25kUExURk9jMFpXYW1sbVVFOUJabUZMVEhJd2VERnhTeTF2VWtKcFpUSkZNM0ZUYUROWFlVYzRhVTlqZFVkdVNIWk5RM1ptTUMxMWVGaDJkVkZsYjNKNlgxTTNXR1phWWxkSE1tMVhWRXhzYmtSalZVcG9abVI0U2tWd2FHWjJZbm8xVjBFd1dXSXpaRkoxTm5OVmNXWTRaRXRMVFVZMFZWQTVZVEJ1UlZOblJtNXFhbUptZVhBeFZqZE1hV1JHV0dsME9IZE5aVXhXZDFSQmJHTklZMDFEUTFKcFVtOW1ObVJ3TjI1clJXZzFjbXRDVlhkeU5rNUpVVTF6VlhOMWEwMTJaRVZLVlVOdU5FSnBMVWhrTUdoRlIyZEVaelJ5ZGpsSFpXVjRaMDEwYWxSWk9Hb3pVRk5aUVd4VFRVbFRXbXhEV1VoNFgwazFlbkZaT1hFeGVtdGlkbTh6VTNKSWNXVnhkVzVzYWtwcFJEQlVXRGxsYVZsclEyc3pXVjl4U21STlQwZDNTR1ZtTjJsd2JYYzFXbGxuTnkweFlsVXlhVE16VTJKdVFrSXRaRkIwVWpWMGExSXlRMlZSVlRGU01tWlVZMUJNZW1GallrZHFka1IyVDJsdmVYQm5kalZvWmxneGNUVnpRak4wVlRObWJ6WjFVemxEZVdwVWFXUndaME5NTVVwcFJFNU9Ra2hYUVVOeFpFbzNPRmhvVTNGclQwVkRiRWxLTUZSNVdsaHJOblUwUkRCeGMxRlZhM2xRZDB0MFpVOWhkRmxoTFZKSE1USmZSMDFDTUhGSGFrVkhkSGw2WlRKSGMzUndkbDk2VDJWTmEyUjBRM2xIVjJkNGRtRmZSVk5QTVZKSVpFVkdSMFkzYVRrdGJrVXpkMEpSWDIxNWVYWnlNSFZTVlZSVFRWSnhNWGN6WkRsaFNVdHpXWE54WkVkdWVsRjFjWFJLVlZCYVRpMUVURU54UTBOd1FrUnJabkZCVmw4d1FYVlFWa3hoTmtaVmFtSmFRVE5yVERrMlRWTnZMVmh5VTFwME1UWjVORmQzTTJadGJpMTBVbDlXUVE9PSIsImVtYWlsIjoidHJ1c3QuZ2l0LmJvdEBnbWFpbC5jb20ifX19 | base64 --decode > pull-secret.txt          
           crc config set preset ${{ matrix.preset }}
-      - name: Setup the crc
-        run: sudo -su $USER crc setup
-      - name: Start the crc
+          crc config set pull-secret-file pull-secret.txt
+          crc config set network-mode user
+          crc config set consent-telemetry no
+      - name: Setup and Start the crc
         run: |
+          sudo -su $USER crc setup
           sudo -su $USER crc start
+          sleep 60
+      - name: Copy OpenShift client
+        run: sudo cp /home/$USER/.crc/bin/oc/oc /usr/bin/
+      - name: Copy the kubeconfig file to required location
+        run: |
+          mkdir -p /home/$USER/.kube
+          cp /home/$USER/.crc/machines/crc/kubeconfig /home/$USER/.kube/config
+          oc get pods -A
       - name: Test
         run: |
-          export HOST_KUBERNETES_CONFIG_FILE=${HOME}/.kube/config
+          export HOST_KUBERNETES_CONFIG_FILE=/home/$USER/.kube/config
           echo "Using ${HOST_KUBERNETES_CONFIG_FILE} as host k8s"
           mvn verify
 

src/main/java/org/trustify/operator/Constants.java

@@ -53,8 +53,6 @@ public class Constants {
     public static final String DB_NAME = "trustify";
     public static final Integer DB_PORT= 5432;
 
-    public static final String DEFAULT_PVC_SIZE = "10G";
-
     public static final String CERTIFICATES_FOLDER = "/mnt/certificates";
     public static final String WORKSPACES_FOLDER = "/mnt/workspace";
 }

src/main/java/org/trustify/operator/TrustifyConfig.java

@@ -0,0 +1,11 @@
+package org.trustify.operator;
+
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithName;
+
+@ConfigMapping(prefix = "trustify")
+public interface TrustifyConfig {
+
+    @WithName("default-pvc-size")
+    String defaultPvcSize();
+}

src/main/java/org/trustify/operator/cdrs/v2alpha1/db/DBActivationCondition.java

@@ -1,16 +1,12 @@
 package org.trustify.operator.cdrs.v2alpha1.db;
 
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
-import org.trustify.operator.cdrs.v2alpha1.TrustifySpec;
-
-import java.util.Optional;
+import org.trustify.operator.cdrs.v2alpha1.server.utils.ServerUtils;
 
 public abstract class DBActivationCondition {
 
     protected boolean isMet(Trustify cr) {
-        return !Optional.ofNullable(cr.getSpec().databaseSpec())
-                .map(TrustifySpec.DatabaseSpec::externalDatabase)
-                .orElse(false);
+        return ServerUtils.isServerDBRequired(cr);
     }
 
 }

src/main/java/org/trustify/operator/cdrs/v2alpha1/db/DBDeployment.java

@@ -14,6 +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.utils.DBUtils;
 import org.trustify.operator.utils.CRDUtils;
 
 import java.util.Arrays;
@@ -56,17 +57,8 @@ public Result<Deployment> match(Deployment actual, Trustify cr, Context<Trustify
     }
 
     @Override
-    public boolean isMet(DependentResource<Deployment, Trustify> dependentResource, Trustify primary, Context<Trustify> context) {
-        return context.getSecondaryResource(Deployment.class, new DBDeploymentDiscriminator())
-                .map(deployment -> {
-                    final var status = deployment.getStatus();
-                    if (status != null) {
-                        final var readyReplicas = status.getReadyReplicas();
-                        return readyReplicas != null && readyReplicas >= 1;
-                    }
-                    return false;
-                })
-                .orElse(false);
+    public boolean isMet(DependentResource<Deployment, Trustify> dependentResource, Trustify cr, Context<Trustify> context) {
+        return DBUtils.isDeploymentReady(dependentResource, cr, context);
     }
 
     @SuppressWarnings("unchecked")

src/main/java/org/trustify/operator/cdrs/v2alpha1/db/DBPersistentVolumeClaim.java

@@ -7,7 +7,9 @@
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
 import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.trustify.operator.Constants;
+import org.trustify.operator.TrustifyConfig;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
 import org.trustify.operator.cdrs.v2alpha1.TrustifySpec;
 import org.trustify.operator.utils.CRDUtils;
@@ -21,6 +23,9 @@ public class DBPersistentVolumeClaim extends CRUDKubernetesDependentResource<Per
 
     public static final String LABEL_SELECTOR = "app.kubernetes.io/managed-by=trustify-operator,component=db";
 
+    @Inject
+    TrustifyConfig trustifyConfig;
+
     public DBPersistentVolumeClaim() {
         super(PersistentVolumeClaim.class);
     }
@@ -36,7 +41,7 @@ private PersistentVolumeClaim newPersistentVolumeClaim(Trustify cr, Context<Trus
                 .getMandatory(Constants.CONTEXT_LABELS_KEY, Map.class);
 
         String pvcStorageSize = CRDUtils.getValueFromSubSpec(cr.getSpec().databaseSpec(), TrustifySpec.DatabaseSpec::pvcSize)
-                .orElse(Constants.DEFAULT_PVC_SIZE);
+                .orElse(trustifyConfig.defaultPvcSize());
 
         return new PersistentVolumeClaimBuilder()
                 .withNewMetadata()

src/main/java/org/trustify/operator/cdrs/v2alpha1/db/DBSecret.java

@@ -6,6 +6,7 @@
 import io.javaoperatorsdk.operator.processing.dependent.Creator;
 import io.javaoperatorsdk.operator.processing.dependent.Matcher;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
+import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
 import jakarta.enterprise.context.ApplicationScoped;
 import org.trustify.operator.Constants;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
@@ -14,9 +15,12 @@
 import java.util.Map;
 import java.util.Random;
 
+@KubernetesDependent(labelSelector = DBSecret.LABEL_SELECTOR, resourceDiscriminator = DBSecretDiscriminator.class)
 @ApplicationScoped
 public class DBSecret extends CRUDKubernetesDependentResource<Secret, Trustify> implements Creator<Secret, Trustify> {
 
+    public static final String LABEL_SELECTOR = "app.kubernetes.io/managed-by=trustify-operator,component=db";
+
     public DBSecret() {
         super(Secret.class);
     }
@@ -42,6 +46,7 @@ private Secret newSecret(Trustify cr, Context<Trustify> context) {
                 .withName(getSecretName(cr))
                 .withNamespace(cr.getMetadata().getNamespace())
                 .withLabels(labels)
+                .addToLabels("component", "db")
                 .withOwnerReferences(CRDUtils.getOwnerReference(cr))
                 .endMetadata()
                 .addToStringData(Constants.DB_SECRET_USERNAME, generateRandomString(10))

src/main/java/org/trustify/operator/cdrs/v2alpha1/db/DBSecretDiscriminator.java

@@ -0,0 +1,21 @@
+package org.trustify.operator.cdrs.v2alpha1.db;
+
+import io.fabric8.kubernetes.api.model.Secret;
+import io.javaoperatorsdk.operator.api.reconciler.Context;
+import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
+import io.javaoperatorsdk.operator.processing.event.ResourceID;
+import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
+import org.trustify.operator.cdrs.v2alpha1.Trustify;
+import org.trustify.operator.controllers.TrustifyReconciler;
+
+import java.util.Optional;
+
+public class DBSecretDiscriminator implements ResourceDiscriminator<Secret, Trustify> {
+    @Override
+    public Optional<Secret> distinguish(Class<Secret> resource, Trustify cr, Context<Trustify> context) {
+        String secret = DBSecret.getSecretName(cr);
+        ResourceID resourceID = new ResourceID(secret, cr.getMetadata().getNamespace());
+        var informerEventSource = (InformerEventSource<Secret, Trustify>) context.eventSourceRetriever().getResourceEventSourceFor(Secret.class, TrustifyReconciler.SECRET_EVENT_SOURCE);
+        return informerEventSource.get(resourceID);
+    }
+}

src/main/java/org/trustify/operator/cdrs/v2alpha1/db/utils/DBUtils.java

@@ -0,0 +1,24 @@
+package org.trustify.operator.cdrs.v2alpha1.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;
+
+public class DBUtils {
+
+    public static boolean isDeploymentReady(DependentResource<Deployment, Trustify> dependentResource, Trustify primary, Context<Trustify> context) {
+        return context.getSecondaryResource(Deployment.class, new DBDeploymentDiscriminator())
+                .map(deployment -> {
+                    final var status = deployment.getStatus();
+                    if (status != null) {
+                        final var readyReplicas = status.getReadyReplicas();
+                        return readyReplicas != null && readyReplicas >= 1;
+                    }
+                    return false;
+                })
+                .orElse(false);
+    }
+
+}

src/main/java/org/trustify/operator/cdrs/v2alpha1/server/ServerStoragePersistentVolumeClaim.java

@@ -6,7 +6,9 @@
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
 import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import org.trustify.operator.Constants;
+import org.trustify.operator.TrustifyConfig;
 import org.trustify.operator.cdrs.v2alpha1.Trustify;
 import org.trustify.operator.cdrs.v2alpha1.TrustifySpec;
 import org.trustify.operator.utils.CRDUtils;
@@ -21,6 +23,9 @@ public class ServerStoragePersistentVolumeClaim extends CRUDKubernetesDependentR
 
     public static final String LABEL_SELECTOR = "app.kubernetes.io/managed-by=trustify-operator,component=server";
 
+    @Inject
+    TrustifyConfig trustifyConfig;
+
     public ServerStoragePersistentVolumeClaim() {
         super(PersistentVolumeClaim.class);
     }
@@ -38,7 +43,7 @@ private PersistentVolumeClaim newPersistentVolumeClaim(Trustify cr, Context<Trus
         String pvcStorageSize = Optional.ofNullable(cr.getSpec().storageSpec())
                 .flatMap(storageSpec -> Optional.ofNullable(storageSpec.filesystemStorageSpec()))
                 .map(TrustifySpec.FilesystemStorageSpec::pvcSize)
-                .orElse(Constants.DEFAULT_PVC_SIZE);
+                .orElse(trustifyConfig.defaultPvcSize());
 
         return new PersistentVolumeClaimBuilder()
                 .withNewMetadata()