From a2a44077509ce43e6b6855bdabcf16f8d7c22f14 Mon Sep 17 00:00:00 2001
From: Daniel McKnight <daniel@neon.ai>
Date: Fri, 1 Dec 2023 17:47:55 -0800
Subject: [PATCH] Update subminds to new images from packaged chatbot repos

---
 .../helm_charts/chatbots/chatbots/Chart.yaml  |  4 +-
 .../helm_charts/chatbots/subminds/Chart.yaml  |  2 +-
 .../subminds/templates/deployment.yaml        |  2 +
 .../helm_charts/chatbots/subminds/values.yaml | 59 +++++++++++++++----
 .../templates/chatbots/Chart.yaml             |  2 +-
 .../templates/mq_user_mapping.yml             | 16 +++--
 6 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/neon_diana_utils/helm_charts/chatbots/chatbots/Chart.yaml b/neon_diana_utils/helm_charts/chatbots/chatbots/Chart.yaml
index 8f6119fc..d084c5df 100644
--- a/neon_diana_utils/helm_charts/chatbots/chatbots/Chart.yaml
+++ b/neon_diana_utils/helm_charts/chatbots/chatbots/Chart.yaml
@@ -3,7 +3,7 @@ name: chatbots
 description: Deploy Chatbots
 
 type: application
-version: 0.0.2
+version: 0.0.3
 appVersion: "1.0.1a2"
 dependencies:
   - name: cbf-facilitators
@@ -12,5 +12,5 @@ dependencies:
     repository: file://../facilitators
   - name: cbf-subminds
     alias: cbf-subminds
-    version: 0.0.1
+    version: 0.0.2
     repository: file://../subminds
diff --git a/neon_diana_utils/helm_charts/chatbots/subminds/Chart.yaml b/neon_diana_utils/helm_charts/chatbots/subminds/Chart.yaml
index fb33024c..2d011124 100644
--- a/neon_diana_utils/helm_charts/chatbots/subminds/Chart.yaml
+++ b/neon_diana_utils/helm_charts/chatbots/subminds/Chart.yaml
@@ -3,5 +3,5 @@ name: cbf-subminds
 description: Chatbotsforum default subminds
 
 type: application
-version: 0.0.1
+version: 0.0.2
 appVersion: "1.0.1a2"
diff --git a/neon_diana_utils/helm_charts/chatbots/subminds/templates/deployment.yaml b/neon_diana_utils/helm_charts/chatbots/subminds/templates/deployment.yaml
index 535489c1..31b06fcb 100644
--- a/neon_diana_utils/helm_charts/chatbots/subminds/templates/deployment.yaml
+++ b/neon_diana_utils/helm_charts/chatbots/subminds/templates/deployment.yaml
@@ -23,6 +23,7 @@ spec:
         - name: {{ .Values.imagePullSecret }}
       containers:
         {{- range .Values.images.containers }}
+        {{- if .enabled }}
         - image: {{ .image }}:{{ $.Values.images.tag }}
           imagePullPolicy: {{ $.Values.images.pullPolicy }}
           name: {{ .name }}
@@ -38,6 +39,7 @@ spec:
           {{- toYaml $.Values.resources | nindent 12 -}}
           {{ end }}
         {{ end }}
+        {{ end }}
       volumes:
         - name: config
           projected:
diff --git a/neon_diana_utils/helm_charts/chatbots/subminds/values.yaml b/neon_diana_utils/helm_charts/chatbots/subminds/values.yaml
index 3e4467e7..fbabe77b 100644
--- a/neon_diana_utils/helm_charts/chatbots/subminds/values.yaml
+++ b/neon_diana_utils/helm_charts/chatbots/subminds/values.yaml
@@ -5,17 +5,56 @@ configFilename: config.json
 configEnvVar: "CONFIG_PATH"
 images:
   pullPolicy: Always
-  tag: 0.2.3
+  tag: dev
   containers:
-    - image: "ghcr.io/neongeckocom/chatbots/eliza"
-      name: "eliza"
-    - image: "ghcr.io/neongeckocom/chatbots/alice"
+    - image: "ghcr.io/neongeckocom/chatbot-alan"
+      name: "alan"
+      enabled: false
+    - image: "ghcr.io/neongeckocom/chatbot-alice"
       name: "alice"
-#    - image: "ghcr.io/neongeckocom/chatbots/hodor"
-#      name: "hodor"
-    - image: "ghcr.io/neongeckocom/chatbots/ned"
+      enabled: true
+    - image: "ghcr.io/neongeckocom/chatbot-blender"
+      name: "blender"
+      enabled: true
+    - image: "ghcr.io/neongeckocom/chatbot-dodecadialog"
+      name: "dodecadialog"
+      enabled: false
+    - image: "ghcr.io/neongeckocom/chatbot-eliza"
+      name: "eliza"
+      enabled: true
+    - image: "ghcr.io/neongeckocom/chatbot-grant"
+      name: "grant"
+      enabled: false
+    - image: "ghcr.io/neongeckocom/chatbot-gruff"
+      name: "gruff"
+      enabled: false
+    - image: "ghcr.io/neongeckocom/chatbot-hodor"
+      name: "hodor"
+      enabled: false
+    - image: "ghcr.io/neongeckocom/chatbot-ima"
+      name: "ima"
+      enabled: true
+    - image: "ghcr.io/neongeckocom/chatbot-maksym"
+      name: "maksym"
+      enabled: false
+    - image: "ghcr.io/neongeckocom/chatbot-mark"
+      name: "mark"
+      enabled: false
+    - image: "ghcr.io/neongeckocom/chatbot-ned"
       name: "ned"
-    - image: "ghcr.io/neongeckocom/chatbots/pard"
+      enabled: true
+    - image: "ghcr.io/neongeckocom/chatbot-pard"
       name: "pard"
-    - image: "ghcr.io/neongeckocom/chatbots/wiz"
-      name: "wiz"
\ No newline at end of file
+      enabled: true
+    - image: "ghcr.io/neongeckocom/chatbot-terry"
+      name: "terry"
+      enabled: true
+    - image: "ghcr.io/neongeckocom/chatbot-tucker"
+      name: "tucker"
+      enabled: false
+    - image: "ghcr.io/neongeckocom/chatbot-wiz"
+      name: "wiz"
+      enabled: true
+    - image: "ghcr.io/neongeckocom/chatbot-wolfram"
+      name: "wolfram"
+      enabled: true
diff --git a/neon_diana_utils/templates/chatbots/Chart.yaml b/neon_diana_utils/templates/chatbots/Chart.yaml
index 9c21cf2d..2f21c127 100644
--- a/neon_diana_utils/templates/chatbots/Chart.yaml
+++ b/neon_diana_utils/templates/chatbots/Chart.yaml
@@ -8,5 +8,5 @@ appVersion: "1.0.1a5"
 
 dependencies:
   - name: chatbots
-    version: 0.0.2
+    version: 0.0.3
     repository: https://neongeckocom.github.io/neon-diana-utils
\ No newline at end of file
diff --git a/neon_diana_utils/templates/mq_user_mapping.yml b/neon_diana_utils/templates/mq_user_mapping.yml
index 4afa76f1..06efe173 100644
--- a/neon_diana_utils/templates/mq_user_mapping.yml
+++ b/neon_diana_utils/templates/mq_user_mapping.yml
@@ -20,14 +20,22 @@ neon_core:
 chat_observer:
   - chat_observer
 neon_bot_submind:
-  - hodor
-  - wiz
+  - alan
   - alice
+  - blender
+  - dodecadialog
   - eliza
+  - grant
+  - gruff
+  - hodor
+  - ima
+  - maksym
+  - mark
+  - ned
   - pard
-  - wolfram
   - terry
-  - ned
+  - tucker
+  - wiz
 neon_bot_facilitator:
   - proctor
   - scorekeeper