From 30284314c0ef900ebc611ed5b55255449f394e0d Mon Sep 17 00:00:00 2001 From: nold Date: Sun, 30 Jun 2024 14:59:23 +0200 Subject: [PATCH] add bi --- projects/ai/project.yaml | 24 ------ projects/bi/manifests/kafka.yml | 14 ++-- projects/bi/manifests/mongo.yml | 26 ++++++ projects/bi/project.yaml | 33 ++++++++ projects/bi/values/bi.yml | 119 +++++++++++++++++++++++++++ projects/bi/values/mongo-express.yml | 50 +++++++++++ 6 files changed, 235 insertions(+), 31 deletions(-) create mode 100644 projects/bi/manifests/mongo.yml create mode 100644 projects/bi/project.yaml create mode 100644 projects/bi/values/bi.yml create mode 100644 projects/bi/values/mongo-express.yml diff --git a/projects/ai/project.yaml b/projects/ai/project.yaml index ef69f087..6a17d939 100644 --- a/projects/ai/project.yaml +++ b/projects/ai/project.yaml @@ -34,27 +34,3 @@ apps: repo: bjw-s chart: app-template targetRevision: 2.4.0 - -# - name: qdrant -# repoURL: https://qdrant.to/helm -# chart: qdrant -# targetRevision: 0.9.1 - -- name: bibot - namespace: bibot - repo: bjw-s - chart: app-template - targetRevision: 3.2.1 - secrets: - - name: bibot - keys: - - discord-token - - ombi-api-key - - prompt-template - - instruct-template - - OPENWEATHERMAP_API_KEY - ignoreDiff: - - group: apps - kind: Deployment - jsonPointers: - - /spec/replicas diff --git a/projects/bi/manifests/kafka.yml b/projects/bi/manifests/kafka.yml index 80219ff0..eee130fc 100644 --- a/projects/bi/manifests/kafka.yml +++ b/projects/bi/manifests/kafka.yml @@ -2,7 +2,7 @@ apiVersion: kafka.strimzi.io/v1beta2 kind: Kafka metadata: name: bi-cluster - namespace: bibot + namespace: bi spec: kafka: version: 3.7.0 @@ -44,7 +44,7 @@ apiVersion: kafka.strimzi.io/v1beta2 kind: KafkaTopic metadata: name: bi-input - namespace: bibot + namespace: bi labels: strimzi.io/cluster: bi-cluster spec: @@ -58,7 +58,7 @@ apiVersion: kafka.strimzi.io/v1beta2 kind: KafkaTopic metadata: name: bi-output - namespace: bibot + namespace: bi labels: strimzi.io/cluster: bi-cluster spec: @@ -72,11 +72,11 @@ apiVersion: kafka.strimzi.io/v1beta2 kind: KafkaTopic metadata: name: agent-registry - namespace: bibot + namespace: bi labels: strimzi.io/cluster: bi-cluster spec: - partitions: 1 + partitions: 24 replicas: 1 config: retention.ms: 7200000 @@ -86,7 +86,7 @@ apiVersion: kafka.strimzi.io/v1beta2 kind: KafkaTopic metadata: name: agent-main-input - namespace: bibot + namespace: bi labels: strimzi.io/cluster: bi-cluster spec: @@ -100,7 +100,7 @@ apiVersion: kafka.strimzi.io/v1beta2 kind: KafkaTopic metadata: name: discord-input - namespace: bibot + namespace: bi labels: strimzi.io/cluster: bi-cluster spec: diff --git a/projects/bi/manifests/mongo.yml b/projects/bi/manifests/mongo.yml new file mode 100644 index 00000000..f1a0a596 --- /dev/null +++ b/projects/bi/manifests/mongo.yml @@ -0,0 +1,26 @@ +--- +apiVersion: mongodbcommunity.mongodb.com/v1 +kind: MongoDBCommunity +metadata: + name: bi-mongo + namespace: bi +spec: + members: 1 + type: ReplicaSet + version: "6.0.5" + security: + authentication: + modes: ["SCRAM"] + users: + - name: admin + db: admin + passwordSecretRef: + name: bi-mongo-password + roles: + - name: clusterAdmin + db: admin + - name: userAdminAnyDatabase + db: admin + scramCredentialsSecretName: bi + additionalMongodConfig: + storage.wiredTiger.engineConfig.journalCompressor: zlib diff --git a/projects/bi/project.yaml b/projects/bi/project.yaml new file mode 100644 index 00000000..d60e2dd6 --- /dev/null +++ b/projects/bi/project.yaml @@ -0,0 +1,33 @@ +config: + description: Bi Agent Framework + +apps: +- name: bi + namespace: bi + repo: bjw-s + chart: app-template + targetRevision: 3.2.1 + secrets: + - name: bibot + keys: + - discord-token + - ombi-api-key + - prompt-template + - instruct-template + - OPENWEATHERMAP_API_KEY + ignoreDiff: + - group: apps + kind: Deployment + jsonPointers: + - /spec/replicas + +- name: mongo-express + repoURL: https://cowboysysop.github.io/charts/ + chart: mongo-express + targetRevision: 6.5.2 + secrets: + - name: mongo-express + keys: + - mongodb-admin-password + - site-cookie-secret + - site-session-secret diff --git a/projects/bi/values/bi.yml b/projects/bi/values/bi.yml new file mode 100644 index 00000000..6bc0581b --- /dev/null +++ b/projects/bi/values/bi.yml @@ -0,0 +1,119 @@ +controllers: + # main agent + main: + containers: + main: + image: + repository: reg.dc/bi + tag: latest + pullPolicy: Always + env: + BIBOT_CONFIG: /config/bibot.yml + BIBOT_KAFKA__BROKER: kafka://bi-cluster-kafka-bootstrap:9092 + BIBOT_MONGODB__URI: mongodb://bi-mongo-svc:27017/ + BIBOT_MONGODB__USER: + valueFrom: + secretKeyRef: + name: bi-mongo-admin-admin + key: username + BIBOT_MONGODB__PASSWORD: + valueFrom: + secretKeyRef: + name: bi-mongo-admin-admin + key: password + PHOENIX_COLLECTOR_ENDPOINT: http://phoenix.phoenix.svc.cluster.local:6006 + PHOENIX_PROJECT_NAME: bi + command: ["python3"] + args: ["/app/bi/agents/main/app.py", "worker", "-l", "info"] + + controller: + containers: + main: + image: + repository: reg.dc/bi + tag: latest + pullPolicy: Always + env: + BIBOT_CONFIG: /config/bibot.yml + BIBOT_KAFKA__BROKER: kafka://bi-cluster-kafka-bootstrap:9092 + BIBOT_MONGODB__URI: mongodb://bi-mongo-svc:27017/ + BIBOT_MONGODB__USER: + valueFrom: + secretKeyRef: + name: bi-mongo-admin-admin + key: username + BIBOT_MONGODB__PASSWORD: + valueFrom: + secretKeyRef: + name: bi-mongo-admin-admin + key: password + command: ["python3"] + args: ["/app/bi/controller.py", "worker", "-l", "info"] + + discord: + containers: + main: + image: + repository: reg.dc/bi + tag: latest + pullPolicy: Always + + command: ["python3"] + args: ["/app/bi/connectors/discord/app.py", "worker", "-l", "info"] + + env: + BIBOT_KAFKA__BROKER: bi-cluster-kafka-bootstrap:9092 + BIBOT_MONGODB__URI: mongodb://bi-mongo-svc:27017/ + BIBOT_MONGODB__USER: + valueFrom: + secretKeyRef: + name: bi-mongo-admin-admin + key: username + BIBOT_MONGODB__PASSWORD: + valueFrom: + secretKeyRef: + name: bi-mongo-admin-admin + key: password + + OPENAI_API_KEY: fake + BIBOT_DISCORD__TOKEN: + valueFrom: + secretKeyRef: + name: bibot + key: discord-token + + ## Prod: + BIBOT_DISCORD__CHANNELS: "1216440541064200192" + # Dev: + # BIBOT_DISCORD_CHANNELS: "1217418069693960223" + probes: + liveness: + enabled: false + readiness: + enabled: false + startup: + enabled: false + +persistence: + secret: + name: bibot + enabled: true + type: secret + + config: + name: bibot-config + enabled: true + type: configMap + + data: + size: 10Gi + type: persistentVolumeClaim + accessMode: ReadWriteOnce + +# service: +# main: +# controller: main +# ports: +# http: +# port: 8000 +# type: ClusterIP diff --git a/projects/bi/values/mongo-express.yml b/projects/bi/values/mongo-express.yml new file mode 100644 index 00000000..c7507908 --- /dev/null +++ b/projects/bi/values/mongo-express.yml @@ -0,0 +1,50 @@ +ingress: + enabled: true + ingressClassName: "ingress-internal" + pathType: ImplementationSpecific + + annotations: + cert-manager.io/cluster-issuer: vault-issuer + + hosts: + - host: mongo.dc + paths: + - / + + tls: + - secretName: mongo-express-tls + hosts: + - mongo.dc + +## @param mongodbServer MongoDB host name or IP address +mongodbServer: bi-mongo-svc.bi.svc.cluster.local + +## @param mongodbPort MongoDB port +mongodbPort: 27017 + +## @param mongodbEnableAdmin Enable administrator access +mongodbEnableAdmin: true + +## @param mongodbAdminUsername Administrator username +mongodbAdminUsername: admin + +## @param mongodbAdminPassword Administrator password +# mongodbAdminPassword: "" + +## @param siteBaseUrl Set the express baseUrl to ease mounting at a subdirectory +siteBaseUrl: / + +## @param basicAuthUsername Mongo Express web login name +basicAuthUsername: "" + +## @param basicAuthPassword Mongo Express web login password +basicAuthPassword: "" + +## @param existingSecret Name of existing Secret to use +existingSecret: "mongo-express" + +## @param existingSecretKeyMongodbAdminPassword Key in existing Secret that contains administrator password +# existingSecretKeyMongodbAdminPassword: bi-mongo-admin-admin + +## @param existingSecretKeyMongodbAuthPassword Key in existing Secret that contains database password +# existingSecretKeyMongodbAuthPassword: bi-mongo-admin-admin