diff --git a/projects/bi/project.yaml b/projects/bi/project.yaml index e4cf45a9..7fa91858 100644 --- a/projects/bi/project.yaml +++ b/projects/bi/project.yaml @@ -27,13 +27,8 @@ apps: chart: qdrant targetRevision: 1.12.6 -# - 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 +- name: valkey + namespace: bi + repoURL: registry-1.docker.io/bitnamicharts + chart: valkey + targetRevision: 2.2.3 diff --git a/projects/bi/values/bi.yml b/projects/bi/values/bi.yml index 008a6af6..4a96cfbe 100644 --- a/projects/bi/values/bi.yml +++ b/projects/bi/values/bi.yml @@ -10,24 +10,17 @@ controllers: 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-bi-bi - key: username - BIBOT_MONGODB__PASSWORD: - valueFrom: - secretKeyRef: - name: bi-mongo-bi-bi - key: password BIBOT_QDRANT__API_KEY: valueFrom: secretKeyRef: name: qdrant-apikey key: api-key - PHOENIX_COLLECTOR_ENDPOINT: http://phoenix.phoenix.svc.cluster.local:6006 - PHOENIX_PROJECT_NAME: bi + BIBOT_VALKEY__HOST: valkey-primary.bi.svc.cluster.local + BIBOT_VALKEY__PASSWORD: + valueFrom: + secretKeyRef: + name: valkey + key: valkey-password OPENAI_API_KEY: fake command: ["python"] args: ["/app/bi/agents/main/app.py", "worker", "-l", "info"] @@ -42,17 +35,12 @@ controllers: 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: + BIBOT_VALKEY__HOST: valkey-primary.bi.svc.cluster.local + BIBOT_VALKEY__PASSWORD: valueFrom: secretKeyRef: - name: bi-mongo-bi-bi - key: username - BIBOT_MONGODB__PASSWORD: - valueFrom: - secretKeyRef: - name: bi-mongo-bi-bi - key: password + name: valkey + key: valkey-password command: ["python"] args: ["/app/bi/controller.py", "worker", "-l", "info"] @@ -66,24 +54,17 @@ controllers: 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-bi-bi - key: username - BIBOT_MONGODB__PASSWORD: - valueFrom: - secretKeyRef: - name: bi-mongo-bi-bi - key: password BIBOT_QDRANT__API_KEY: valueFrom: secretKeyRef: name: qdrant-apikey key: api-key - PHOENIX_COLLECTOR_ENDPOINT: http://phoenix.phoenix.svc.cluster.local:6006 - PHOENIX_PROJECT_NAME: bi + BIBOT_VALKEY__PASSWORD: + valueFrom: + secretKeyRef: + name: valkey + key: valkey-password + BIBOT_VALKEY__HOST: valkey-primary.bi.svc.cluster.local OPENAI_API_KEY: fake command: ["python"] args: ["/app/bi/agents/memory/app.py", "worker", "-l", "info"] @@ -102,17 +83,7 @@ controllers: 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-bi-bi - key: username - BIBOT_MONGODB__PASSWORD: - valueFrom: - secretKeyRef: - name: bi-mongo-bi-bi - key: password + BIBOT_VALKEY__HOST: valkey-primary.bi.svc.cluster.local OPENAI_API_KEY: fake BIBOT_DISCORD__TOKEN: valueFrom: @@ -132,20 +103,6 @@ controllers: startup: enabled: false - mongoui: - containers: - main: - image: - repository: ugleiton/mongo-gui - tag: latest - pullPolicy: Always - env: - MONGO_URL: - valueFrom: - secretKeyRef: - name: bi-mongo-bi-bi - key: connectionString.standardSrv - persistence: secret: name: bibot @@ -162,28 +119,28 @@ persistence: type: persistentVolumeClaim accessMode: ReadWriteOnce -service: - main: - controller: mongoui - ports: - http: - port: 4321 - type: ClusterIP +# service: +# main: +# controller: mongoui +# ports: +# http: +# port: 4321 +# type: ClusterIP -ingress: - main: - annotations: - cert-manager.io/cluster-issuer: vault-issuer - enabled: true - hosts: - - host: mongo.dc - paths: - - path: / - service: - # name: main - identifier: main - port: 4321 - tls: - - hosts: - - mongo.dc - secretName: mongo-tls +# ingress: +# main: +# annotations: +# cert-manager.io/cluster-issuer: vault-issuer +# enabled: true +# hosts: +# - host: mongo.dc +# paths: +# - path: / +# service: +# # name: main +# identifier: main +# port: 4321 +# tls: +# - hosts: +# - mongo.dc +# secretName: mongo-tls diff --git a/projects/bi/values/mongo-express.yml b/projects/bi/values/mongo-express.yml deleted file mode 100644 index c7507908..00000000 --- a/projects/bi/values/mongo-express.yml +++ /dev/null @@ -1,50 +0,0 @@ -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 diff --git a/projects/bi/values/valkey.yml b/projects/bi/values/valkey.yml new file mode 100644 index 00000000..dfef688c --- /dev/null +++ b/projects/bi/values/valkey.yml @@ -0,0 +1 @@ +architecture: standalone