Merge branch 'trustyai-explainability:main' into main

red-hat-data-services · Oct 15, 2024 · e02ed79 · e02ed79
2 parents c4baadf + 4893d79
commit e02ed79
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/config/base/params.env b/config/base/params.env
@@ -1,4 +1,4 @@
 trustyaiServiceImage=quay.io/trustyai/trustyai-service:latest
 trustyaiOperatorImage=quay.io/trustyai/trustyai-service-operator:latest
 oauthProxyImage=quay.io/openshift/origin-oauth-proxy:4.14.0
-kServeServerless=disabled
+kServeServerless=enabled
diff --git a/config/overlays/rhoai/params.env b/config/overlays/rhoai/params.env
@@ -1,4 +1,4 @@
 trustyaiServiceImage=quay.io/trustyai/trustyai-service:latest
 trustyaiOperatorImage=quay.io/trustyai/trustyai-service-operator:latest
 oauthProxyImage=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33
-kServeServerless=disabled
+kServeServerless=enabled
diff --git a/controllers/database.go b/controllers/database.go
@@ -12,7 +12,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
-// checkDatabaseAccessible checks if the TrustyAI service pod failed with database issues.
 func (r *TrustyAIServiceReconciler) checkDatabaseAccessible(ctx context.Context, instance *trustyaiopendatahubiov1alpha1.TrustyAIService) (bool, error) {
 	deployment := &appsv1.Deployment{}
 	err := r.Get(ctx, types.NamespacedName{Name: instance.Name, Namespace: instance.Namespace}, deployment)

diff --git a/controllers/statuses.go b/controllers/statuses.go
@@ -87,7 +87,12 @@ func (r *TrustyAIServiceReconciler) reconcileStatuses(ctx context.Context, insta
 			UpdateRouteAvailable(saved)
 
 			if instance.Spec.Storage.IsStorageDatabase() || instance.IsMigration() {
-				UpdateDBAvailable(saved)
+				if status.DBReady {
+					UpdateDBAvailable(saved)
+				} else {
+					UpdateDBConnectionError(saved)
+					return
+				}
 			}
 
 			UpdateTrustyAIServiceAvailable(saved)

diff --git a/controllers/templates/service/deployment.tmpl.yaml b/controllers/templates/service/deployment.tmpl.yaml
@@ -122,6 +122,20 @@ spec:
             - name: STORAGE_MIGRATION_CONFIG_FROM_FILENAME
               value: {{ .Instance.Spec.Data.Filename }}
             {{ end }}
+          readinessProbe:
+            httpGet:
+              path: /q/health/ready
+              port: 8080
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            timeoutSeconds: 2
+          livenessProbe:
+            httpGet:
+              path: /q/health/live
+              port: 8080
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            timeoutSeconds: 2
           volumeMounts:
             - name: {{ .Instance.Name }}-internal
               readOnly: false