osrdyne: alloz more flexible amqp/keda configuration

Signed-off-by: Élyse Viard <[email protected]>
OpenRailAssociation · Oct 24, 2024 · 0aaa711 · 0aaa711
1 parent feed32a
commit 0aaa711
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 11 deletions.
diff --git a/templates/editoast/deployment.yaml b/templates/editoast/deployment.yaml
@@ -69,7 +69,7 @@ spec:
               value: "{{ .Values.endpoints.public }}/api"
 
             - name: OSRD_MQ_URL
-              {{- $amqp := .Values.endpoints.amqp }}
+              {{- $amqp := .Values.endpoints.amqp.url }}
               {{- if eq (typeOf $amqp) "map" }}
               valueFrom:
                 {{- toYaml $amqp.valueFrom | nindent 6 }}

diff --git a/templates/editoast/migration_job.yaml b/templates/editoast/migration_job.yaml
@@ -34,7 +34,7 @@ spec:
               value: "{{ .Values.endpoints.public }}/api"
 
             - name: OSRD_MQ_URL
-              {{- $amqp := .Values.endpoints.amqp }}
+              {{- $amqp := .Values.endpoints.amqp.url }}
               {{- if eq (typeOf $amqp) "map" }}
               valueFrom:
                 {{- toYaml $amqp.valueFrom | nindent 6 }}

diff --git a/templates/osrdyne/deployment.yaml b/templates/osrdyne/deployment.yaml
@@ -64,7 +64,7 @@ spec:
 
           env:
             - name: OSRDYNE__AMQP_URI
-              {{- $amqp := .Values.endpoints.amqp }}
+              {{- $amqp := .Values.endpoints.amqp.url }}
               {{- if eq (typeOf $amqp) "map" }}
               valueFrom:
                 {{- toYaml $amqp.valueFrom | nindent 6 }}
@@ -73,7 +73,7 @@ spec:
               {{- end }}
 
             - name: OSRDYNE__MANAGEMENT_URI
-              {{- $amqpManagement := .Values.endpoints.amqpManagement }}
+              {{- $amqpManagement := .Values.endpoints.amqp.management }}
               {{- if eq (typeOf $amqpManagement) "map" }}
               valueFrom:
                 {{- toYaml $amqpManagement.valueFrom | nindent 6 }}
@@ -83,12 +83,12 @@ spec:
 
             {{- if (eq .Values.services.core.autoscaling.type "Keda") }}
             - name: OSRDYNE__WORKER_DRIVER__AUTOSCALING__AMQP_HOST
-              {{- $amqp := .Values.endpoints.amqp }}
-              {{- if eq (typeOf $amqp) "map" }}
+              {{- $amqpManagementWithVHost := .Values.endpoints.managementWithVhost }}
+              {{- if eq (typeOf $amqpManagementWithVHost) "map" }}
               valueFrom:
-                {{- toYaml $amqp.valueFrom | nindent 6 }}
+                {{- toYaml $amqpManagementWithVHost.valueFrom | nindent 6 }}
               {{- else }}
-              value: "{{ $amqp }}"
+              value: "{{ $amqpManagementWithVHost }}"
               {{- end }}
             {{- end }}
 

diff --git a/templates/stateful_editoast/deployment.yaml b/templates/stateful_editoast/deployment.yaml
@@ -68,7 +68,7 @@ spec:
               value: "{{ .Values.endpoints.public }}/api"
 
             - name: OSRD_MQ_URL
-              {{- $amqp := .Values.endpoints.amqp }}
+              {{- $amqp := .Values.endpoints.amqp.url }}
               {{- if eq (typeOf $amqp) "map" }}
               valueFrom:
                 {{- toYaml $amqp.valueFrom | nindent 6 }}

diff --git a/values.yaml b/values.yaml
@@ -15,8 +15,10 @@ affinity: {}
 # in the env variable that uses it (merged directly).
 endpoints:
   public: https://my-osrd-instance.org
-  amqp: "amqp://osrd:password@rabbitmq:5672/%2f"
-  amqpManagement: "http://osrd:password@rabbitmq:15672"
+  amqp:
+    url: "amqp://osrd:password@rabbitmq:5672/%2f"
+    management: "http://osrd:password@rabbitmq:15672"
+    managementWithVhost: "http://osrd:password@rabbitmq:15672/%2f"
   postgresql: "postgres://osrd:password@postgres:5432/osrd"
   redis: redis://username:pwd@redis:6379/0