Merge branch 'stable' into mascore-13906

Author: stonepd

bin/mas-devops-notify-slack

@@ -189,7 +189,7 @@ def notifyAnsibleStart(channels: list[str], taskName: str, instanceId: str | Non
 
     # Send task start message as thread reply to all channels
     taskMessage = [
-        SlackUtil.buildSection(f"⏳ **{taskName}** - Started")
+        SlackUtil.buildSection(f"⏳ *{taskName}* - Started")
     ]
 
     allSuccess = True
@@ -292,7 +292,7 @@ def notifyAnsibleComplete(channels: list[str], rc: int, taskName: str, instanceI
 
         # Build the completion message
         taskMessage = [
-            SlackUtil.buildSection(f"{emoji} **{taskName}** - {status}{durationText}")
+            SlackUtil.buildSection(f"{emoji} *{taskName}* - {status}{durationText}")
         ]
         if rc != 0:
             taskMessage.append(SlackUtil.buildSection(f"Return Code: `{rc}`\nCheck logs for details"))

src/mas/devops/pre_install.py

@@ -180,7 +180,7 @@ def _get_preinstall_mas_rbac_namespaces(masInstanceId: str, permissionMode: str,
     namespaces = {f"mas-{masInstanceId}-core"}
 
     appNamespaces = {
-        "aiservice": f"mas-{masInstanceId}-aiservice",
+        "aiservice": f"aiservice-{masInstanceId}",
         "arcgis": f"mas-{masInstanceId}-arcgis",
         "facilities": f"mas-{masInstanceId}-facilities",
         "iot": f"mas-{masInstanceId}-iot",

src/mas/devops/templates/pipelinerun-install.yml.j2

@@ -104,7 +104,7 @@ spec:
     - name: db2_action_facilities
       value: "{{ db2_action_facilities}}"
     - name: db2_action_aiservice
-      value: "{{ db2_action_aiservice }}"   
+      value: "{{ db2_action_aiservice }}"
 
     # Dependencies - Db2u Operator
     # -------------------------------------------------------------------------
@@ -630,6 +630,10 @@ spec:
     - name: mas_appws_bindings_jdbc_manage
       value: "{{ mas_appws_bindings_jdbc_manage }}"
   {%- endif %}
+  {%- if mas_appws_bindings_kafka_manage is defined and mas_appws_bindings_kafka_manage != "" %}
+    - name: mas_appws_bindings_kafka_manage
+      value: "{{ mas_appws_bindings_kafka_manage }}"
+  {%- endif %}
   {%- if mas_app_settings_persistent_volumes_flag is defined and mas_app_settings_persistent_volumes_flag != "" %}
     - name: mas_app_settings_persistent_volumes_flag
       value: "{{ mas_app_settings_persistent_volumes_flag }}"
@@ -827,6 +831,10 @@ spec:
       value: "{{ aiservice_instance_id }}"
     - name: aiservice_channel
       value: "{{ aiservice_channel }}"
+{%- if configure_aiassistant is defined and configure_aiassistant != "" %}
+    - name: configure_aiassistant
+      value: "{{ configure_aiassistant }}"
+{%- endif %}
 
     - name: environment_type
       value: "{{ environment_type }}"
@@ -844,14 +852,12 @@ spec:
       value: "{{ tenant_scheduling_config_file }}"
 {%- endif %}
 
-    # RSL
+{%- if rsl_ca_crt is defined and rsl_ca_crt != "" %}
+    # RSL - CA Certificate
     # -------------------------------------------------------------------------
-    - name: rsl_url
-      value: "{{ rsl_url }}"
-    - name: rsl_org_id
-      value: "{{ rsl_org_id }}"
-    - name: rsl_token
-      value: "{{ rsl_token }}"
+    - name: rsl_ca_crt
+      value: "{{ rsl_ca_crt }}"
+{%- endif %}
 
     # S3
     # -------------------------------------------------------------------------
@@ -960,7 +966,7 @@ spec:
     - name: shared-certificates
       secret:
         secretName: pipeline-certificates
-    
+
     # The Db2 license file
     - name: shared-db2
       secret: