Add disableHealthCheck functionality for DB/ObjStore

- Useful for local testing and debugging

Author: gmfrasca

api/v1alpha1/dspipeline_types.go

@@ -122,6 +122,9 @@ type MlPipelineUI struct {
 type Database struct {
 	*MariaDB    `json:"mariaDB,omitempty"`
 	*ExternalDB `json:"externalDB,omitempty"`
+	// +kubebuilder:default:=false
+	// +kubebuilder:validation:Optional
+	DisableHealthCheck bool `json:"disableHealthCheck"`
 }
 
 type MariaDB struct {
@@ -151,6 +154,9 @@ type ExternalDB struct {
 type ObjectStorage struct {
 	*Minio           `json:"minio,omitempty"`
 	*ExternalStorage `json:"externalStorage,omitempty"`
+	// +kubebuilder:default:=false
+	// +kubebuilder:validation:Optional
+	DisableHealthCheck bool `json:"disableHealthCheck"`
 }
 
 type Minio struct {

config/crd/bases/datasciencepipelinesapplications.opendatahub.io_datasciencepipelinesapplications.yaml

@@ -138,6 +138,9 @@ spec:
                   mariaDB:
                     deploy: true
                 properties:
+                  disableHealthCheck:
+                    default: false
+                    type: boolean
                   externalDB:
                     properties:
                       host:
@@ -431,6 +434,9 @@ spec:
                 type: object
               objectStorage:
                 properties:
+                  disableHealthCheck:
+                    default: false
+                    type: boolean
                   externalStorage:
                     properties:
                       bucket:

controllers/database.go

@@ -54,6 +54,11 @@ func (r *DSPAReconciler) isDatabaseAccessible(ctx context.Context, dsp *dspav1al
 	params *DSPAParams) bool {
 	log := r.Log.WithValues("namespace", dsp.Namespace).WithValues("dspa_name", dsp.Name)
 
+	if params.DatabaseHealthCheckDisabled(dsp) {
+		log.V(1).Info("Database health check disabled, assuming database is available and ready.")
+		return true
+	}
+
 	log.Info("Performing Database Health Check")
 	databaseSpecified := dsp.Spec.Database != nil
 	usingExternalDB := params.UsingExternalDB(dsp)

controllers/dspipeline_params.go

@@ -81,6 +81,14 @@ func (p *DSPAParams) UsingExternalDB(dsp *dspa.DataSciencePipelinesApplication)
 	return false
 }
 
+// StorageHealthCheckDisabled will return the value if the Database has disableHealthCheck specified in the CR, otherwise false.
+func (p *DSPAParams) DatabaseHealthCheckDisabled(dsp *dspa.DataSciencePipelinesApplication) bool {
+	if dsp.Spec.Database != nil {
+		return dsp.Spec.Database.DisableHealthCheck
+	}
+	return false
+}
+
 // UsingExternalStorage will return true if an external Object Storage is specified in the CR, otherwise false.
 func (p *DSPAParams) UsingExternalStorage(dsp *dspa.DataSciencePipelinesApplication) bool {
 	if dsp.Spec.ObjectStorage != nil && dsp.Spec.ObjectStorage.ExternalStorage != nil {
@@ -89,6 +97,14 @@ func (p *DSPAParams) UsingExternalStorage(dsp *dspa.DataSciencePipelinesApplicat
 	return false
 }
 
+// ObjectStorageHealthCheckDisabled will return the value if the Object Storage has disableHealthCheck specified in the CR, otherwise false.
+func (p *DSPAParams) ObjectStorageHealthCheckDisabled(dsp *dspa.DataSciencePipelinesApplication) bool {
+	if dsp.Spec.ObjectStorage != nil {
+		return dsp.Spec.ObjectStorage.DisableHealthCheck
+	}
+	return false
+}
+
 func (p *DSPAParams) UsingMLMD(dsp *dspa.DataSciencePipelinesApplication) bool {
 	if dsp.Spec.MLMD != nil {
 		return dsp.Spec.MLMD.Deploy

controllers/storage.go

@@ -85,6 +85,11 @@ var ConnectAndQueryObjStore = func(ctx context.Context, log logr.Logger, endpoin
 func (r *DSPAReconciler) isObjectStorageAccessible(ctx context.Context, dsp *dspav1alpha1.DataSciencePipelinesApplication,
 	params *DSPAParams) bool {
 	log := r.Log.WithValues("namespace", dsp.Namespace).WithValues("dspa_name", dsp.Name)
+	if params.ObjectStorageHealthCheckDisabled(dsp) {
+		log.V(1).Info("Object Storage health check disabled, assuming object store is available and ready.")
+		return true
+	}
+
 	log.Info("Performing Object Storage Health Check")
 
 	endpoint := joinHostPort(params.ObjectStorageConnection.Host, params.ObjectStorageConnection.Port)
@@ -100,7 +105,7 @@ func (r *DSPAReconciler) isObjectStorageAccessible(ctx context.Context, dsp *dsp
 		return false
 	}
 
-	verified := ConnectAndQueryObjStore(ctx, log, endpoint, accesskey, secretkey, params.ObjectStorageConnection.Secure)
+	verified := ConnectAndQueryObjStore(ctx, log, endpoint, accesskey, secretkey, *params.ObjectStorageConnection.Secure)
 	if verified {
 		log.Info("Object Storage Health Check Successful")
 	} else {