purge rabbitmq

chart/Chart.yaml

@@ -13,7 +13,3 @@ dependencies:
   name: postgresql
   repository: https://charts.bitnami.com/bitnami
   version: 18.1.3
-- condition: rabbitmq.enabled
-  name: rabbitmq
-  repository: https://charts.bitnami.com/bitnami
-  version: 16.0.14

chart/README.md

@@ -1,5 +1,5 @@
 # Kyoo Helm Chart
-Kyoo consists of multiple interconnected workloads, leveraging a variety of technologies including Postgres, and RabbitMQ.  This helm chart is designed to simplify configurations for basic setups while offering advanced customization options.  Naming and opinionation aims to follow structures described in [diagrams](../DIAGRAMS.md).
+Kyoo consists of multiple interconnected workloads, leveraging a variety of technologies including Postgres.  This helm chart is designed to simplify configurations for basic setups while offering advanced customization options.  Naming and opinionation aims to follow structures described in [diagrams](../DIAGRAMS.md).
 
 # Examples
 ## Quickstart
@@ -14,8 +14,6 @@ kyoo:
   address: https://kyoo.mydomain.com
 postgresql:
   enabled: true
-rabbitmq:
-  enabled: true
 extraObjects:
   - apiVersion: v1
     kind: Secret
@@ -27,9 +25,6 @@ extraObjects:
       MEILI_MASTER_KEY: barkLike8SuperDucks
       postgres_user: kyoo_all
       postgres_password: watchSomething4me
-      rabbitmq_user: kyoo_all
-      rabbitmq_password: youAreAmazing2
-      rabbitmq_cookie: mmmGoodCookie
   - kind: PersistentVolumeClaim
     apiVersion: v1
     metadata:
@@ -53,8 +48,6 @@ global:
       host: postgres
     kyoo_transcoder:
       host: postgres
-  rabbitmq:
-    host: rabbitmq
 # specify hardware resources
 transcoder:
   kyoo_transcoder:
@@ -92,8 +85,6 @@ stringData:
   MEILI_MASTER_KEY: barkLike8SuperDucks
   postgres_user: kyoo_all
   postgres_password: watchSomething4me
-  rabbitmq_user: kyoo_all
-  rabbitmq_password: youAreAmazing2
 ```
 
 # Additional Notes
@@ -101,7 +92,7 @@ stringData:
 Kyoo consists of multiple microservices.  Best practice is for each microservice to use its own database.  Kyoo workloads support best practices or sharing a single postgres database.  Please see the `POSTGRES_SCHEMA` setting for additional information.  Strongly recomended to use a Kubernetes operator for managing Postgres.
 
 ## Subchart Support
-Subcharts are updated frequently and subject to changes.  This chart includes subcharts for deploying PostgreSQL, and RabbitMQ.  Please consider hosting those independently of Kyoo to better handle versioning and lifecycle management.
+Subcharts are updated frequently and subject to changes.  This chart includes subcharts for deploying PostgreSQL.  Please consider hosting those independently of Kyoo to better handle versioning and lifecycle management.
 
 # v5 ForwardAuth Requirement
 Starting with v5, Kyoo leverages ForwardAuth middleware for offloading auth from the microservices onto a gateway.  For additional reading, please see gateway-api sigs [documentation](https://gateway-api.sigs.k8s.io/geps/gep-1494/). 

chart/templates/autosync/deployment.yaml

@@ -51,20 +51,8 @@ spec:
               {{- toYaml . | nindent 12 }}
             {{- end }}
           env:
-            - name: RABBITMQ_HOST
-              value: {{ .Values.global.rabbitmq.host | quote }}
-            - name: RABBITMQ_PORT
-              value: {{ .Values.global.rabbitmq.port | quote }}
-            - name: RABBITMQ_DEFAULT_USER
-              valueFrom:
-                secretKeyRef:
-                  key: {{ .Values.global.rabbitmq.kyoo_autosync.userKey }}
-                  name: {{ .Values.global.rabbitmq.kyoo_autosync.existingSecret }}
-            - name: RABBITMQ_DEFAULT_PASS
-              valueFrom:
-                secretKeyRef:
-                  key: {{ .Values.global.rabbitmq.kyoo_autosync.passwordKey }}
-                  name: {{ .Values.global.rabbitmq.kyoo_autosync.existingSecret }}
+            - name: PLACEHOLDER
+              value: PLACEHOLDER
             {{- with (concat .Values.global.extraEnv .Values.autosync.kyoo_autosync.extraEnv) }}
               {{- toYaml . | nindent 12 }}
             {{- end }}

chart/templates/back/deployment.yaml

@@ -112,20 +112,6 @@ spec:
               value: {{ .Values.global.postgres.kyoo_back.host | quote }}
             - name: POSTGRES_PORT
               value: {{ .Values.global.postgres.kyoo_back.port | quote }}
-            - name: RABBITMQ_DEFAULT_USER
-              valueFrom:
-                secretKeyRef:
-                  key: {{ .Values.global.rabbitmq.kyoo_back.userKey }}
-                  name: {{ .Values.global.rabbitmq.kyoo_back.existingSecret }}
-            - name: RABBITMQ_DEFAULT_PASS
-              valueFrom:
-                secretKeyRef:
-                  key: {{ .Values.global.rabbitmq.kyoo_back.passwordKey }}
-                  name: {{ .Values.global.rabbitmq.kyoo_back.existingSecret }}
-            - name: RABBITMQ_HOST
-              value: {{ .Values.global.rabbitmq.host | quote }}
-            - name: RABBITMQ_PORT
-              value: {{ .Values.global.rabbitmq.port | quote }}
             {{- range $index, $provider := .Values.kyoo.oidc_providers }}
             - name: OIDC_{{ $provider.name | upper }}_NAME
               value: {{ $provider.name | quote }}

chart/templates/scanner/deployment.yaml

@@ -64,20 +64,6 @@ spec:
               value: "http://{{ include "kyoo.back.fullname" . }}:5000/api"
             - name: LIBRARY_LANGUAGES
               value: {{ .Values.kyoo.languages | quote }}
-            - name: RABBITMQ_HOST
-              value: {{ .Values.global.rabbitmq.host | quote }}
-            - name: RABBITMQ_PORT
-              value: {{ .Values.global.rabbitmq.port | quote }}
-            - name: RABBITMQ_DEFAULT_USER
-              valueFrom:
-                secretKeyRef:
-                  key: {{ .Values.global.rabbitmq.kyoo_scanner.userKey }}
-                  name: {{ .Values.global.rabbitmq.kyoo_scanner.existingSecret }}
-            - name: RABBITMQ_DEFAULT_PASS
-              valueFrom:
-                secretKeyRef:
-                  key: {{ .Values.global.rabbitmq.kyoo_scanner.passwordKey }}
-                  name: {{ .Values.global.rabbitmq.kyoo_scanner.existingSecret }}
             {{- with (concat .Values.global.extraEnv .Values.scanner.kyoo_scanner.extraEnv) }}
               {{- toYaml . | nindent 12 }}
             {{- end }}

chart/values.yaml

@@ -69,34 +69,6 @@ global:
         userKey: postgres_user
         passwordKey: postgres_password
         existingSecret: bigsecret
-  # kyoo connectivity & subchart settings for rabbitmq
-  # subchart configuration can be found at .rabbitmq
-  rabbitmq:
-    host: kyoo-rabbitmq
-    port: 5672
-    # vhost is not used yet https://github.com/zoriya/Kyoo/issues/537
-    # vhost: ""
-    # subchart specific settings
-    infra:
-      # user must be manually aligned via rabbitmq.auth.user
-      passwordKey: rabbitmq_password
-      keyErlangCookie: rabbitmq_cookie
-      existingSecret: bigsecret
-    # kyoo_autosync workload specific settings
-    kyoo_autosync:
-      userKey: rabbitmq_user
-      passwordKey: rabbitmq_password
-      existingSecret: bigsecret
-    # kyoo_back workload specific settings
-    kyoo_back:
-      userKey: rabbitmq_user
-      passwordKey: rabbitmq_password
-      existingSecret: bigsecret
-    # kyoo_scanner workload specific settings
-    kyoo_scanner:
-      userKey: rabbitmq_user
-      passwordKey: rabbitmq_password
-      existingSecret: bigsecret
 
 # kyoo application settings
 kyoo:
@@ -500,17 +472,5 @@ postgresql:
     persistence:
       size: 3Gi
 
-# subchart settings
-rabbitmq:
-  enabled: false
-  auth:
-    # default user to be created by rabbitmq subchart
-    # subchart is unable to consume a secret for specifying user
-    username: kyoo_all
-    existingPasswordSecret: "{{ .Values.global.rabbitmq.infra.existingSecret }}"
-    existingSecretPasswordKey: "{{ .Values.global.rabbitmq.infra.passwordKey }}"
-    existingErlangSecret: "{{ .Values.global.rabbitmq.infra.existingSecret }}"
-    existingSecretErlangKey: "{{ .Values.global.rabbitmq.infra.keyErlangCookie }}"
-
 # allows for the creation of any additional kubernetes resources
 extraObjects: []