Skip to content

Commit

Permalink
add values.yml for app and clarify scheme
Browse files Browse the repository at this point in the history
  • Loading branch information
erohmensing committed Nov 24, 2020
1 parent 08c3637 commit d3603b7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
4 changes: 2 additions & 2 deletions charts/rasa-x/templates/rasa-config-files-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
data:
rasa-credentials: |
rasa:
url: {{ .Values.rasax.scheme }}://{{ include "rasa-x.host" . }}.{{ .Release.Namespace }}.svc:{{ .Values.rasax.port }}/api
url: {{ .Values.rasax.scheme }}://{{ include "rasa-x.host" . }}.{{ .Release.Namespace }}.svc:{{ .Values.rasax.port }}/api
{{- with .Values.rasa.additionalChannelCredentials }}
{{ toYaml . | nindent 4 }}
{{- end }}
Expand Down Expand Up @@ -45,7 +45,7 @@ data:
{{- end }}
{{- end }}
action_endpoint:
url: "{{ .Values.app.scheme }}://{{ include "rasa-x.fullname" . }}-app.{{ .Release.Namespace }}.svc:{{ template "rasa-x.custom-actions.port" . }}{{ .Values.app.endpoints.actionEndpointUrl }}"
url: "{{ .Values.app.scheme }}://{{ include "rasa-x.fullname" . }}-app.{{ .Release.Namespace }}.svc:{{ template "rasa-x.custom-actions.port" . }}{{ .Values.app.endpoints.actionEndpointUrl }}"
token: ""
{{- if $.Values.redis.install }}
lock_store:
Expand Down
2 changes: 1 addition & 1 deletion charts/rasa-x/templates/rasa-deployments.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ spec:
- --no-prompt
- --production
- --config-endpoint
- {{ $.Values.rasax.scheme }}://{{ include "rasa-x.fullname" $ }}-rasa-x.{{ $.Release.Namespace }}.svc:{{ default 5002 $.Values.rasax.port }}/api/config?token=$(RASA_X_TOKEN)
- {{ $.Values.rasax.scheme }}://{{ include "rasa-x.fullname" $ }}-rasa-x.{{ $.Release.Namespace }}.svc:{{ default 5002 $.Values.rasax.port }}/api/config?token=$(RASA_X_TOKEN)
- --port
- "{{ $.Values.rasa.port }}"
- --jwt-method
Expand Down
8 changes: 5 additions & 3 deletions charts/rasa-x/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ rasax:
tag: ""
# port on which Rasa X runs
port: 5002
# scheme
# scheme by which Rasa X is accessible
scheme: http
# passwordSalt Rasa X uses to salt the user passwords
passwordSalt: "passwordSalt"
Expand Down Expand Up @@ -116,7 +116,7 @@ rasa:
tag: ""
# port on which Rasa runs
port: 5005
# scheme
# scheme by which Rasa services are accessible
scheme: http
# token Rasa accepts as authentication token from other Rasa services
token: "rasaToken"
Expand Down Expand Up @@ -374,6 +374,8 @@ app:
replicaCount: 1
# port on which the custom action server runs
port: 5055
# scheme by which custom action server is accessible
scheme: http
# resources which app is required / allowed to use
resources: {}
# Jaeger Sidecar
Expand Down Expand Up @@ -510,7 +512,7 @@ duckling:
replicaCount: 1
# port on which duckling should run
port: 8000
# scheme
# scheme by which duckling is accessible
scheme: http

# tolerations can be used to control the pod to node assignment
Expand Down

0 comments on commit d3603b7

Please sign in to comment.