Add exceptions for not Semantic Versions

RasaHQ · Oct 16, 2020 · 8c7b46f · 8c7b46f · loomsen · Oct 26, 2020
1 parent 96b2674
commit 8c7b46f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/charts/rasa-x/Chart.yaml b/charts/rasa-x/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
 
-version: "1.6.7"
+version: "1.6.8"
 appVersion: "0.30.1"
 
 name: rasa-x

diff --git a/charts/rasa-x/templates/rasa-config-files-configmap.yaml b/charts/rasa-x/templates/rasa-config-files-configmap.yaml
@@ -33,12 +33,17 @@ data:
       username: "{{ .Values.rabbitmq.rabbitmq.username }}"
       password: ${RABBITMQ_PASSWORD}
       port: {{ default 5672 .Values.rabbitmq.service.port }}
+      {{ if or (regexMatch ".*(a|rc)[0-9]+" .Values.rasa.tag) (regexMatch "2.*[0-9]+-full" .Values.rasa.tag) -}}
+      queues:
+      - ${RABBITMQ_QUEUE}
+      {{- else -}}
       {{ if semverCompare ">= 1.9.0" .Values.rasa.tag -}}
       queues:
-        - ${RABBITMQ_QUEUE}
+      - ${RABBITMQ_QUEUE}
       {{- else -}}
       queue: ${RABBITMQ_QUEUE}
       {{- end }}
+      {{- end }}
     action_endpoint:
       url: "http://{{ include "rasa-x.fullname" . }}-app:{{ template "rasa-x.custom-actions.port" . }}{{ .Values.app.endpoints.actionEndpointUrl }}"
       token:  ""