Merge branch 'openshift:main' into postgres-remaining-quota-update

Author: sriroopar

Containerfile

@@ -1,5 +1,5 @@
 # vim: set filetype=dockerfile
-ARG LIGHTSPEED_RAG_CONTENT_IMAGE=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/own-app-lightspeed-rag-content@sha256:b63ed7dfb029785669c83636d85e152f974fd0c858c079f3eb20be0315885868
+ARG LIGHTSPEED_RAG_CONTENT_IMAGE=quay.io/redhat-user-workloads/crt-nshift-lightspeed-tenant/own-app-lightspeed-rag-content@sha256:dc8d30a1937137277ef18ea609d107cb7bb3a09adfdd09736e855abd5700cd13
 ARG HERMETIC=false
 
 FROM --platform=linux/amd64 ${LIGHTSPEED_RAG_CONTENT_IMAGE} as lightspeed-rag-content

docs/openapi.json

@@ -3,7 +3,7 @@
     "info": {
         "title": "Swagger OpenShift LightSpeed service - OpenAPI",
         "description": "OpenShift LightSpeed service API specification.",
-        "version": "1.0.6"
+        "version": "1.0.7"
     },
     "paths": {
         "/v1/query": {

ols/version.py

@@ -1,4 +1,4 @@
 """Service version that is read by project manager tools."""
 
 # this should be the only version value used in all source codes!!!
-__version__ = "1.0.6"
+__version__ = "1.0.7"

scripts/build-container.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Version
-OLS_VERSION=v1.0.6
+OLS_VERSION=v1.0.7
 
 # To build container for local use
 if [ -z "$OLS_NO_IMAGE_CACHE" ]; then

tests/e2e/test_api.py

@@ -464,9 +464,8 @@ def test_azure_entra_id():
     json_response = response.json()
 
     # checking a few major information from response
-    assert "Kubernetes is" in json_response["response"]
     assert re.search(
-        r"orchestration (tool|system|platform|engine)",
+        r"kubernetes|openshift",
         json_response["response"],
         re.IGNORECASE,
     )

tests/e2e/test_query_endpoint.py

@@ -222,9 +222,8 @@ def test_valid_question() -> None:
 
         # checking a few major information from response
         assert json_response["conversation_id"] == cid
-        assert "Kubernetes is" in json_response["response"]
         assert re.search(
-            r"orchestration (tool|system|platform|engine)",
+            r"kubernetes|openshift",
             json_response["response"],
             re.IGNORECASE,
         )

tests/e2e/test_streaming_query_endpoint.py

@@ -209,9 +209,8 @@ def test_valid_question() -> None:
 
         response_utils.check_content_type(response, constants.MEDIA_TYPE_TEXT)
 
-        assert "Kubernetes is" in response.text
         assert re.search(
-            r"orchestration (tool|system|platform|engine)",
+            r"kubernetes|openshift",
             response.text,
             re.IGNORECASE,
         )