Update facilitators to new image refs

Update configuration handling for chatbots deployments
NeonGeckoCom · Dec 6, 2023 · 5ee4f9e · 5ee4f9e
1 parent a2a4407
commit 5ee4f9e
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 36 deletions.
diff --git a/neon_diana_utils/configuration.py b/neon_diana_utils/configuration.py
@@ -558,9 +558,8 @@ def configure_chatbots(rmq_path: str = None,
             update_rmq_config(rmq_config)
             click.echo(f"Updated RabbitMQ config file: {rmq_config}")
         chatbots_config = _get_chatbots_mq_config(rmq_config)
-        with open(join(output_path, "chatbots",
-                       "chatbots_config.json"), 'w+') as f:
-            json.dump(chatbots_config, f, indent=2)
+        with open(join(output_path, "chatbots", "chatbots.yaml"), 'w+') as f:
+            yaml.safe_dump(chatbots_config, f)
         click.echo(f"Outputs generated in {output_path}")
 
     except Exception as e:

diff --git a/neon_diana_utils/helm_charts/chatbots/chatbots/Chart.yaml b/neon_diana_utils/helm_charts/chatbots/chatbots/Chart.yaml
@@ -3,14 +3,14 @@ name: chatbots
 description: Deploy Chatbots
 
 type: application
-version: 0.0.3
+version: 0.0.4
 appVersion: "1.0.1a2"
 dependencies:
   - name: cbf-facilitators
     alias: cbf-facilitators
-    version: 0.0.1
+    version: 0.0.2
     repository: file://../facilitators
   - name: cbf-subminds
     alias: cbf-subminds
-    version: 0.0.2
+    version: 0.0.3
     repository: file://../subminds
diff --git a/neon_diana_utils/helm_charts/chatbots/chatbots/values.yaml b/neon_diana_utils/helm_charts/chatbots/chatbots/values.yaml
@@ -1,5 +1,5 @@
 configMap: &config cbf-config
-configFilename: &filename config.json
+configFilename: &filename klat.yaml
 imagePullSecret: &secret github-auth
 
 cbf-facilitators:

diff --git a/neon_diana_utils/helm_charts/chatbots/facilitators/Chart.yaml b/neon_diana_utils/helm_charts/chatbots/facilitators/Chart.yaml
@@ -3,5 +3,5 @@ name: cbf-facilitators
 description: Chatbotsforum facilitators
 
 type: application
-version: 0.0.1
+version: 0.0.2
 appVersion: "1.0.1a2"
diff --git a/neon_diana_utils/helm_charts/chatbots/facilitators/templates/deployment.yaml b/neon_diana_utils/helm_charts/chatbots/facilitators/templates/deployment.yaml
@@ -26,9 +26,6 @@ spec:
         - image: {{ .image }}:{{ .tag }}
           imagePullPolicy: {{ $.Values.images.pullPolicy }}
           name: {{ .name }}
-          env:
-            - name: {{ .configEnvVar }}
-              value: /config/neon/{{ $.Values.configFilename }}
           volumeMounts:
             - name: config
               mountPath: /config/neon/{{ $.Values.configFilename }}

diff --git a/neon_diana_utils/helm_charts/chatbots/facilitators/values.yaml b/neon_diana_utils/helm_charts/chatbots/facilitators/values.yaml
@@ -1,23 +1,26 @@
 replicaCount: 1
 serviceName: cbf-facilitators
 configMap: chatbots-config
-configFilename: config.json
+configFilename: klat.yaml
 images:
   pullPolicy: Always
   containers:
-    - image: "ghcr.io/neongeckocom/mq-chatbots-observer"
-      tag: "latest"
+    # TODO: Update to neongeckocom repo before release
+    - image: "ghcr.io/neondaniel/mq-chatbots-observer"
+      tag: "test"
       name: "chatbots-observer"
-      configEnvVar: "CHATBOTS_OBSERVER_CONFIG"
-    - image: "ghcr.io/neongeckocom/chatbots/proctor"
-      tag: "0.2.3"
+    - image: "ghcr.io/neongeckocom/chat-facilitator-automator"
+      tag: "dev"
+      name: "chat-automator"
+    - image: "ghcr.io/neongeckocom/chat-facilitator-context_keeper"
+      tag: "dev"
+      name: "context-keeper"
+    - image: "ghcr.io/neongeckocom/chat-facilitator-proctor"
+      tag: "dev"
       name: "proctor"
-      configEnvVar: "CONFIG_PATH"
-    - image: "ghcr.io/neongeckocom/chatbots/scorekeeper"
-      tag: "0.2.3"
+    - image: "ghcr.io/neongeckocom/chat-facilitator-scorekeeper"
+      tag: "dev"
       name: "scorekeeper"
-      configEnvVar: "CONFIG_PATH"
-    - image: "ghcr.io/neongeckocom/chatbots/chat_automator"
-      tag: "0.2.3"
-      name: "chat-automator"
-      configEnvVar: "CONFIG_PATH"
+    - image: "ghcr.io/neongeckocom/chat-facilitator-stenographer"
+      tag: "dev"
+      name: "stenographer"
diff --git 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.2
+version: 0.0.3
 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
@@ -27,9 +27,6 @@ spec:
         - image: {{ .image }}:{{ $.Values.images.tag }}
           imagePullPolicy: {{ $.Values.images.pullPolicy }}
           name: {{ .name }}
-          env:
-            - name: {{ $.Values.configEnvVar }}
-              value: /config/neon/{{ $.Values.configFilename }}
           volumeMounts:
             - name: config
               mountPath: /config/neon/{{ $.Values.configFilename }}

diff --git a/neon_diana_utils/helm_charts/chatbots/subminds/templates/service.yaml b/neon_diana_utils/helm_charts/chatbots/subminds/templates/service.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     neon.project.name: chatbots
     neon.diana.service: {{ default .Chart.Name .Values.serviceName }}
-    neon.service.class: facilitators
+    neon.service.class: subminds
   name: {{ default .Chart.Name .Values.serviceName }}
 spec:
   clusterIP: None

diff --git a/neon_diana_utils/helm_charts/chatbots/subminds/values.yaml b/neon_diana_utils/helm_charts/chatbots/subminds/values.yaml
@@ -1,8 +1,7 @@
 replicaCount: 1
 serviceName: cbf-subminds
 configMap: chatbots-config
-configFilename: config.json
-configEnvVar: "CONFIG_PATH"
+configFilename: klat.yaml
 images:
   pullPolicy: Always
   tag: dev

diff --git a/neon_diana_utils/helm_charts/http/tts-glados/Chart.yaml b/neon_diana_utils/helm_charts/http/tts-glados/Chart.yaml
@@ -9,4 +9,4 @@ appVersion: "1.0.1a11"
 dependencies:
   - name: base-http
     version: 0.0.4
-    repository: file://../../base/base-http
+    repository: https://neongeckocom.github.io/neon-diana-utils
diff --git 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.3
+    version: 0.0.4
     repository: https://neongeckocom.github.io/neon-diana-utils
diff --git a/neon_diana_utils/templates/chatbots/templates/config-map.yaml b/neon_diana_utils/templates/chatbots/templates/config-map.yaml
@@ -1,3 +1,3 @@
-{{- $_cbf_config := .Files.Get "chatbots_config.json" -}}
+{{- $_cbf_config := .Files.Get "chatbots.yaml" -}}
 {{ $_ := set .Values.chatbots "cbfConfig" $_cbf_config }}
 {{- include "cbf_config.configmap" . }}
diff --git a/neon_diana_utils/templates/mq_user_mapping.yml b/neon_diana_utils/templates/mq_user_mapping.yml
@@ -39,5 +39,5 @@ neon_bot_submind:
 neon_bot_facilitator:
   - proctor
   - scorekeeper
-  - chat_automator
+  - automator
   - chatbots_observer