fix vertex

Signed-off-by: Adrian Cole <[email protected]>

Author: codefromthecrypt

example-apps/chatbot-rag-app/Dockerfile

@@ -25,15 +25,12 @@ EXPOSE 4000
 # docker invocations to reenable.
 ENV OTEL_SDK_DISABLED=true
 
-# https://github.com/elastic/genai-instrumentation/issues/255
-# Currently Python SDK has a bug that spams logs when opentelemetry-instrument is used
-# with SDK being disabled. Until it is fixed, we handle it in our own entrypoint by
-# avoiding opentelemetry-instrument when SDK is disabled.
+# TODO remove custom entrypoint when EDOT Python >0.7.0 is released.
 RUN echo 'if [ "${OTEL_SDK_DISABLED:-true}" == "false" ]; \
   then \
     opentelemetry-instrument $@; \
   else \
     exec $@; \
   fi' > entrypoint.sh
 ENTRYPOINT [ "bash", "-eu", "./entrypoint.sh" ]
-CMD [ "python", "api/app.py"]
+CMD [ "python", "api/app.py" ]

example-apps/chatbot-rag-app/README.md

@@ -129,7 +129,6 @@ kubectl port-forward deployment.apps/chatbot-rag-app 4000:4000 &
 ```
 
 Clean up when finished, like this:
-
 ```bash
 kubectl delete -f k8s-manifest.yml
 ```

example-apps/chatbot-rag-app/k8s-manifest.yml

@@ -13,37 +13,34 @@ spec:
       labels:
         app: chatbot-rag-app
     spec:
-      # The below will recreate your secret based on the gcloud credentials file
-      # kubectl create secret generic gcloud-credentials \
-      #  --from-file=application_default_credentials.json=$HOME/.config/gcloud/application_default_credentials.json
+      # For `LLM_TYPE=vertex`: create a volume for application_default_credentials.json
       volumes:
         - name: gcloud-credentials
           secret:
             secretName: gcloud-credentials
       initContainers:
       - name: create-index
         image: &image ghcr.io/elastic/elasticsearch-labs/chatbot-rag-app:latest
+        command: &command [ "bash", "-eu", "./entrypoint.sh" ] # match image
         args: ["flask", "create-index"]
-        env:
-          - name: FLASK_APP
-            value: api/app.py
         # This recreates your configmap based on your .env file:
         # kubectl create configmap chatbot-rag-app-env --from-env-file=.env
         envFrom: &envFrom
           - configMapRef:
               name: chatbot-rag-app-env
-        volumeMounts: &volumeMounts
-          - name: gcloud-credentials
-            mountPath: /root/.config/
-            subPath: application_default_credentials.json
-            readOnly: true
       containers:
       - name: api-frontend
         image: *image
+        command: *command
+        args: [ "python", "api/app.py" ]
         ports:
           - containerPort: 4000
         envFrom: *envFrom
-        volumeMounts: *volumeMounts
+        # For `LLM_TYPE=vertex`: mount credentials to the path read by the google-cloud-sdk
+        volumeMounts:
+          - name: gcloud-credentials
+            mountPath: /root/.config/gcloud
+            readOnly: true
 ---
 apiVersion: v1
 kind: Service