Changes to support use of lightspeed-stack

Author: manstis

config/crd/bases/aiconnect.ansible.com_ansibleaiconnects.yaml

@@ -1055,11 +1055,23 @@ spec:
                 description: The version of the image used for the deployed instance
                 type: string
               chatbotImage:
-                description: URL of the chatbot image used for the deployed instance
+                description: URL of the Chatbot image used for the deployed instance
                 type: string
               chatbotVersion:
                 description: The version of the Chatbot image used for the deployed instance
                 type: string
+              chatbotRAGDatabaseImage:
+                description: URL of the Chatbot RAG database image used for the deployed instance
+                type: string
+              chatbotMCPGatewayImage:
+                description: URL of the Chatbot MCP Gateway Server image used for the deployed instance
+                type: string
+              chatbotMCPControllerImage:
+                description: URL of the Chatbot MCP Controller Server image used for the deployed instance
+                type: string
+              chatbotMCPLightspeedImage:
+                description: URL of the Chatbot MCP Lightspeed Server image used for the deployed instance
+                type: string
               URL:
                 description: URL to access the deployed instance
                 type: string

config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: quay.io/ansible/ansible-ai-connect-operator
-  newTag: 0.1.0
+  newName: quay.io/manstis/ansible-ai-connect-operator
+  newTag: 0.0.1

roles/chatbot/tasks/deploy_chatbot_api.yml

@@ -7,6 +7,7 @@
   loop:
     - 'chatbot.pvc'
     - 'chatbot.service'
+    - 'chatbot.configmap'
     - 'chatbot.deployment'
 
 - name: Check for Chatbot Pod

roles/chatbot/tasks/main.yml

@@ -17,9 +17,6 @@
   - name: Deploy AnsibleAIConnect's Chatbot service
     ansible.builtin.include_tasks: deploy_chatbot_api.yml
 
-  - name: Register MCP servers
-    ansible.builtin.include_tasks: register_mcp_servers.yml
-
   when:
     - chatbot_config_secret_name is defined
     - chatbot_config_secret_name | length

roles/chatbot/tasks/register_mcp_servers.yml

@@ -0,0 +1,44 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: '{{ ansible_operator_meta.name }}-{{ deployment_type }}-lightspeed-stack-config'
+  namespace: '{{ ansible_operator_meta.namespace }}'
+  labels:
+    {{ lookup("template", "../common/templates/labels/common.yaml.j2") | indent(width=4) | trim }}
+  annotations:
+    checksum-secret-chatbot_config: "{{ lookup('ansible.builtin.vars', 'chatbot_config', default='')["resources"][0]["data"] | default('') | sha1 }}"
+data:
+  lightspeed-stack.yaml: |
+    name: Ansible Lightspeed Intelligent Assistant
+    service:
+      host: 0.0.0.0
+      port: 8080
+      auth_enabled: false
+      workers: 1
+      color_log: true
+      access_log: true
+    llama_stack:
+      use_as_library_client: true
+      library_client_config_path: /.llama/distributions/ansible-chatbot/ansible-chatbot-run.yaml
+    user_data_collection:
+      feedback_disabled: true
+      transcripts_disabled: true
+{% if _aap_gateway_url is defined or _aap_controller_url is defined %}
+    mcp_servers:
+{% if _aap_gateway_url is defined and _aap_gateway_token is defined %}
+      - name: mcp::aap-gateway
+        provider_id: lightspeed
+        url: http://127.0.0.1:8003/sse
+{% endif %}
+{% if _aap_gateway_url is defined and _aap_controller_url is defined %}
+      - name: mcp::aap-controller
+        provider_id: lightspeed
+        url: http://127.0.0.1:8004/sse
+{% endif %}
+{% if _aap_gateway_url is defined %}
+      - name: mcp::aap-lightspeed
+        provider_id: lightspeed
+        url: http://127.0.0.1:8005/sse
+{% endif %}
+{% endif %}

roles/chatbot/templates/chatbot.configmap.yaml.j2

@@ -34,6 +34,7 @@ spec:
         app.kubernetes.io/component: '{{ deployment_type }}-chatbot-api'
       annotations:
         kubectl.kubernetes.io/default-container: 'ansible-chatbot'
+        checksum-chatbot.configmap: "{{ lookup('template', 'chatbot.configmap.yaml.j2') | sha1 }}"
         checksum-secret-chatbot_config: "{{ lookup('ansible.builtin.vars', 'chatbot_config', default='')["resources"][0]["data"] | default('') | sha1 }}"
     spec:
       serviceAccountName: '{{ ansible_operator_meta.name }}'
@@ -105,6 +106,9 @@ spec:
         ports:
           - containerPort: 8321
         volumeMounts:
+          - name: lightspeed-stack-config
+            mountPath: /.llama/data/lightspeed-stack.yaml
+            subPath: lightspeed-stack.yaml
           - name: ansible-chatbot-storage
             mountPath: /.llama/data
 {% if is_openshift %}
@@ -268,6 +272,9 @@ spec:
         - name: ansible-chatbot-storage
           persistentVolumeClaim:
             claimName: "{{ ansible_operator_meta.name }}-chatbot-pvc"
+        - name: lightspeed-stack-config
+          configMap:
+            name: '{{ ansible_operator_meta.name }}-{{ deployment_type }}-lightspeed-stack-config'
 {% if is_openshift %}
         - name: server-tls-certs
           configMap:

roles/chatbot/templates/chatbot.deployment.yaml.j2

@@ -15,9 +15,6 @@
       dbFieldsEncryptionSecret: "{{ __db_fields_encryption_secret_name }}"
       image: "{{ _image }}"
       version: ""
-      chatbotImage: ""
-      chatbotVersion: ""
-      chatbotConfigurationSecret: ""
 
 # ============================================
 # Retrieve and update AnsibleAIConnect status
@@ -80,14 +77,17 @@
 
 # ============================================
 # Retrieve and update Chatbot status
-# --------------------------------------------
-# There is no mechanism to handle the chatbot version
-# See https://issues.redhat.com/browse/AAP-48026
 # ============================================
 - block:
-    - name: Set Chatbot instance version
-      ansible.builtin.set_fact:
-        chatbot_instance_version: '0.0.1'
+    - name: Retrieve Chatbot instance version
+      kubernetes.core.k8s_exec:
+        namespace: "{{ ansible_operator_meta.namespace }}"
+        pod: "{{ chatbot_api_pod_name }}"
+        container: "ansible-chatbot"
+        command: >-
+          bash -c "cat /.llama/distributions/ansible-chatbot/ansible-chatbot-version-info.json | jq -r .version"
+      register: chatbot_instance_version
+      changed_when: false
       no_log: "{{ no_log }}"
 
     - name: Update Chatbot version status
@@ -98,8 +98,58 @@
         namespace: "{{ ansible_operator_meta.namespace }}"
         status:
           chatbotImage: "{{ _chatbot_image }}"
-          chatbotVersion: "{{ chatbot_instance_version }}"
+          chatbotVersion: "{{ chatbot_instance_version.stdout | trim }}"
           chatbotConfigurationSecret: "{{ chatbot_config_secret_name }}"
+
+    - name: Update Chatbot RAG database image status
+      operator_sdk.util.k8s_status:
+        api_version: '{{ api_version }}'
+        kind: "{{ kind }}"
+        name: "{{ ansible_operator_meta.name }}"
+        namespace: "{{ ansible_operator_meta.namespace }}"
+        status:
+          chatbotRAGDatabaseImage: "{{ _chatbot_rag_db_image }}"
+
+    - name: Update MCP Gateway Server image status
+      operator_sdk.util.k8s_status:
+        api_version: '{{ api_version }}'
+        kind: "{{ kind }}"
+        name: "{{ ansible_operator_meta.name }}"
+        namespace: "{{ ansible_operator_meta.namespace }}"
+        status:
+          chatbotMCPGatewayImage: "{{ _chatbot_mcp_gateway_image }}"
+      when:
+        - _aap_gateway_url is defined
+        - _aap_gateway_url | length
+        - _aap_gateway_token is defined
+        - _aap_gateway_token | length
+
+    - name: Update MCP Controller Server image status
+      operator_sdk.util.k8s_status:
+        api_version: '{{ api_version }}'
+        kind: "{{ kind }}"
+        name: "{{ ansible_operator_meta.name }}"
+        namespace: "{{ ansible_operator_meta.namespace }}"
+        status:
+          chatbotMCPControllerImage: "{{ _chatbot_mcp_controller_image }}"
+      when:
+        - _aap_gateway_url is defined
+        - _aap_gateway_url | length
+        - _aap_controller_url is defined
+        - _aap_controller_url | length
+
+    - name: Update MCP Lightspeed Server image status
+      operator_sdk.util.k8s_status:
+        api_version: '{{ api_version }}'
+        kind: "{{ kind }}"
+        name: "{{ ansible_operator_meta.name }}"
+        namespace: "{{ ansible_operator_meta.namespace }}"
+        status:
+          chatbotMCPLightspeedImage: "{{ _chatbot_mcp_lightspeed_image }}"
+      when:
+        - _aap_gateway_url is defined
+        - _aap_gateway_url | length
+
   when:
     - chatbot_api_pod_name is defined
     - chatbot_api_pod_name | length