Merge pull request #108 from rh-aiservices-bu/prepare-for-main

Update main

.github/.wordlist.txt

@@ -21,6 +21,7 @@ Backend
 bgd
 bordershadow
 bugfix
+california
 CarImage
 cd
 centric
@@ -31,6 +32,7 @@ ChatOps
 Chris
 claimdb
 CLI
+CLM
 cls
 CMD
 config
@@ -51,6 +53,7 @@ diag
 dir
 diy
 DIY
+dmv
 dotenv
 drawio
 ds
@@ -60,6 +63,7 @@ dvh
 eCommerce
 elyra
 Elyra
+Embeddings
 eng
 env
 EOF
@@ -71,6 +75,8 @@ EXAMPLEs
 FastAPI
 ffdrf
 fi
+flant
+FlanT
 formatter
 fromarray
 frontend
@@ -84,6 +90,7 @@ gitignore
 gitops
 GitOps
 Globex
+GPUs
 Grafana
 Granafa
 Granger
@@ -129,6 +136,8 @@ Lundberg
 LWBS
 mAP
 md
+milvus
+Milvus
 minio
 Minio
 MinIO
@@ -239,6 +248,7 @@ un
 unopinionated
 url
 userX
+vectordb
 venv
 vscode
 VSCode

bootstrap/ic-rhoai-configuration/images-puller.yaml

@@ -57,7 +57,7 @@ spec:
     spec:
       containers:
       - name: oauth-proxy
-        image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33
+        image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:4bef31eb993feb6f1096b51b4876c65a6fb1f4401fee97fa4f4542b6b7c9bc46
         command: ["tail"]
         args: ["-f", "/dev/null"]
         resources:
@@ -144,6 +144,16 @@ spec:
             requests:
               cpu: 10m
               memory: 10Mi
+        - name: oauth-proxy
+          image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ab112105ac37352a2a4916a39d6736f5db6ab4c29bad4467de8d613e80e9bb33
+          command: ["tail"]
+          args: ["-f", "/dev/null"]
+          resources:
+            limits:
+              memory: 20Mi
+            requests:
+              cpu: 10m
+              memory: 10Mi
         - name: ds-pipeline-persistenceagent-pipelines-definition
           image: registry.redhat.io/rhoai/odh-ml-pipelines-persistenceagent-rhel8@sha256:6fdf2b754aea6732ae0757e099ec69fac1cb32e633342a160546ee5b99604af7
           command: ["tail"]

bootstrap/ic-user-projects/create-projects-and-resources-job.yaml

@@ -25,6 +25,18 @@ spec:
           # Get user count
           user_count=$(oc get namespaces | grep showroom | wc -l)
 
+          echo -n 'Waiting for minio-root-user secret'
+          while [ -z "\$(oc get secret -n ic-shared-minio minio-root-user -oname 2>/dev/null)" ]; do
+            echo -n .
+            sleep 5
+          done; echo
+
+          echo -n 'Waiting for rhods-dashboard route'
+          while [ -z "\$(oc get route -n redhat-ods-applications rhods-dashboard -oname 2>/dev/null)" ]; do
+            echo -n .
+            sleep 5
+          done; echo
+
           # Get needed variables
           MINIO_ROOT_USER=$(oc get secret minio-root-user -n ic-shared-minio -o template --template '{{.data.MINIO_ROOT_USER|base64decode}}')
           MINIO_ROOT_PASSWORD=$(oc get secret minio-root-user -n ic-shared-minio -o template --template '{{.data.MINIO_ROOT_PASSWORD|base64decode}}')
@@ -141,12 +153,6 @@ spec:
                 - args:
                   - -ec
                   - |-
-                    echo -n "Waiting for minio-root-user to exist"
-                    while [ -z "\$(oc get secret -n ic-shared-minio minio-root-user -oname 2>/dev/null)" ]; do
-                      echo -n '.'
-                      sleep 1
-                    done; echo
-
                     echo "Minio user: $MINIO_ROOT_USER"
                     echo "Minio pass: $MINIO_ROOT_PASSWORD"
                     echo "Internal service url: http://minio.ic-shared-minio.svc.cluster.local:9000/"
@@ -513,5 +519,8 @@ spec:
                     pod_name=\$(oc get pods --selector=app=$WORKBENCH_NAME -o jsonpath='{.items[0].metadata.name}') && oc exec \$pod_name -- git clone https://github.com/rh-aiservices-bu/parasol-insurance
                 restartPolicy: Never
           EOF
+
+          sleep 20
+          
           done
       restartPolicy: Never

bootstrap/ic-user-projects/create-projects-and-resources.bash

@@ -2,6 +2,18 @@
 # Get user count
 user_count=$(oc get namespaces | grep showroom | wc -l)
 
+echo -n 'Waiting for minio-root-user secret'
+while [ -z "\$(oc get secret -n ic-shared-minio minio-root-user -oname 2>/dev/null)" ]; do
+  echo -n .
+  sleep 5
+done; echo
+
+echo -n 'Waiting for rhods-dashboard route'
+while [ -z "\$(oc get route -n redhat-ods-applications rhods-dashboard -oname 2>/dev/null)" ]; do
+  echo -n .
+  sleep 5
+done; echo
+
 # Get needed variables
 MINIO_ROOT_USER=$(oc get secret minio-root-user -n ic-shared-minio -o template --template '{{.data.MINIO_ROOT_USER|base64decode}}')
 MINIO_ROOT_PASSWORD=$(oc get secret minio-root-user -n ic-shared-minio -o template --template '{{.data.MINIO_ROOT_PASSWORD|base64decode}}')
@@ -119,12 +131,6 @@ spec:
       - args:
         - -ec
         - |-
-          echo -n "Waiting for minio-root-user to exist"
-          while [ -z "\$(oc get secret -n ic-shared-minio minio-root-user -oname 2>/dev/null)" ]; do
-            echo -n '.'
-            sleep 1
-          done; echo
-
           echo "Minio user: $MINIO_ROOT_USER"
           echo "Minio pass: $MINIO_ROOT_PASSWORD"
           echo "Internal service url: http://minio.ic-shared-minio.svc.cluster.local:9000/"
@@ -491,4 +497,7 @@ spec:
           pod_name=\$(oc get pods --selector=app=$WORKBENCH_NAME -o jsonpath='{.items[0].metadata.name}') && oc exec \$pod_name -- git clone https://github.com/rh-aiservices-bu/parasol-insurance
       restartPolicy: Never
 EOF
+
+sleep 20
+
 done