Skip to content

Commit

Permalink
Merge pull request #48 from RasaHQ/issue-15
Browse files Browse the repository at this point in the history
Use Raxa X version as a default for nginx and event-service
tczekajlo authored May 12, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 28a9402 + 9c6a832 commit 2902a50
Showing 5 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion charts/rasa-x/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: v2

version: "1.2.6"
version: "1.2.7"
appVersion: "0.27.4"

name: rasa-x
7 changes: 7 additions & 0 deletions charts/rasa-x/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -192,3 +192,10 @@ Return the checksum of Rasa X values.
{{- define "rasa-x.checksum" -}}
{{ toYaml .Values.rasax | sha256sum }}
{{- end -}}

{{/*
Return the AppVersion value as a default if the rasax.tag variable is not defined.
*/}}
{{- define "rasa-x.version" -}}
{{ .Values.rasax.tag | default .Chart.AppVersion }}
{{- end -}}
2 changes: 1 addition & 1 deletion charts/rasa-x/templates/event-service-deployment.yaml
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ spec:
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.eventService.name }}:{{ .Values.eventService.tag | default .Chart.AppVersion }}"
image: "{{ .Values.eventService.name }}:{{ .Values.eventService.tag | default (include "rasa-x.version" .) }}"
imagePullPolicy: {{ .Values.images.pullPolicy }}
ports:
- name: "http"
2 changes: 1 addition & 1 deletion charts/rasa-x/templates/nginx-deployment.yaml
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ spec:
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.nginx.name }}:{{ .Values.nginx.tag | default .Chart.AppVersion }}"
image: "{{ .Values.nginx.name }}:{{ .Values.nginx.tag | default (include "rasa-x.version" .) }}"
imagePullPolicy: {{ .Values.images.pullPolicy }}
ports:
- name: "http"
2 changes: 1 addition & 1 deletion charts/rasa-x/templates/rasa-x-deployment.yaml
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ spec:
{{- end }}
containers:
- name: {{ .Chart.Name }}
image: "{{ .Values.rasax.name }}:{{ .Values.rasax.tag | default .Chart.AppVersion }}"
image: "{{ .Values.rasax.name }}:{{ include "rasa-x.version" . }}"
imagePullPolicy: {{ .Values.images.pullPolicy }}
ports:
- name: "http"

0 comments on commit 2902a50

Please sign in to comment.