Skip to content

Commit

Permalink
Merge pull request #98 from RasaHQ/autoservice
Browse files Browse the repository at this point in the history
Make the automountServiceAccountToken parameter configurable
  • Loading branch information
Tomasz Czekajlo authored Nov 6, 2020
2 parents 0e90406 + 810a060 commit 4b42b16
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 7 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.7.3"
version: "1.7.4"
appVersion: "0.33.0"

name: rasa-x
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
{{- include "rasa-x.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: db-migration-service
spec:
automountServiceAccountToken: false
automountServiceAccountToken: {{ .Values.dbMigrationService.automountServiceAccountToken }}
{{ include "rasa-x.spec" . }}
{{- if .Values.dbMigrationService.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion charts/rasa-x/templates/duckling-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
{{- include "rasa-x.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: duckling
spec:
automountServiceAccountToken: false
automountServiceAccountToken: {{ .Values.duckling.automountServiceAccountToken }}
{{ include "rasa-x.spec" . }}
{{- if .Values.duckling.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion charts/rasa-x/templates/event-service-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
{{- include "rasa-x.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: event-service
spec:
automountServiceAccountToken: false
automountServiceAccountToken: {{ .Values.eventService.automountServiceAccountToken }}
{{ include "rasa-x.spec" . }}
{{- if .Values.eventService.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion charts/rasa-x/templates/nginx-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
{{- include "rasa-x.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: nginx
spec:
automountServiceAccountToken: false
automountServiceAccountToken: {{ .Values.nginx.automountServiceAccountToken }}
{{ include "rasa-x.spec" . }}
{{- if .Values.nginx.nodeSelector }}
nodeSelector:
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 @@ -24,7 +24,7 @@ spec:
checksum/rasa-config: {{ include (print $.Template.BasePath "/rasa-config-files-configmap.yaml") $ | sha256sum }}
checksum/rasa-secret: {{ include (print $.Template.BasePath "/rasa-secret.yaml") $ | sha256sum }}
spec:
automountServiceAccountToken: false
automountServiceAccountToken: {{ $.Values.rasa.automountServiceAccountToken }}
{{ include "rasa-x.spec" $ }}
{{- if $.Values.rasa.nodeSelector }}
nodeSelector:
Expand Down
2 changes: 1 addition & 1 deletion charts/rasa-x/templates/rasa-x-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
checksum/rasa-x-config: {{ include (print $.Template.BasePath "/rasa-x-config-files-configmap.yaml") . | sha256sum }}
checksum/rasa-secret: {{ include (print $.Template.BasePath "/rasa-secret.yaml") . | sha256sum }}
spec:
automountServiceAccountToken: false
automountServiceAccountToken: {{ .Values.rasax.automountServiceAccountToken }}
{{ include "rasa-x.spec" . }}
{{- if .Values.rasax.nodeSelector }}
nodeSelector:
Expand Down
30 changes: 30 additions & 0 deletions charts/rasa-x/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ rasax:
nodeSelector: {}
# "beta.kubernetes.io/instance-type": "g3.8xlarge"

# automountServiceAccountToken specifies whether the Kubernetes service account
# credentials should be automatically mounted into the pods. See more about it in
# https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server
automountServiceAccountToken: false

# rasa: Settings common for all Rasa containers
rasa:
# version is the Rasa Open Source version which should be used.
Expand Down Expand Up @@ -148,6 +153,11 @@ rasa:
nodeSelector: {}
# "beta.kubernetes.io/instance-type": "g3.8xlarge"

# automountServiceAccountToken specifies whether the Kubernetes service account
# credentials should be automatically mounted into the pods. See more about it in
# https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server
automountServiceAccountToken: false

# versions of the Rasa container which are running
versions:
# rasaProduction is the container which serves the production environment
Expand Down Expand Up @@ -246,6 +256,11 @@ dbMigrationService:
# - name: tmpdir
# emptyDir: {}

# automountServiceAccountToken specifies whether the Kubernetes service account
# credentials should be automatically mounted into the pods. See more about it in
# https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server
automountServiceAccountToken: false

# event-service specific settings
eventService:
# override the default command to run in the container
Expand Down Expand Up @@ -291,6 +306,11 @@ eventService:
# - name: tmpdir
# emptyDir: {}

# automountServiceAccountToken specifies whether the Kubernetes service account
# credentials should be automatically mounted into the pods. See more about it in
# https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server
automountServiceAccountToken: false

# app (custom action server) specific settings
app:
# override the default command to run in the container
Expand Down Expand Up @@ -406,6 +426,11 @@ nginx:
# - name: tmpdir
# emptyDir: {}

# automountServiceAccountToken specifies whether the Kubernetes service account
# credentials should be automatically mounted into the pods. See more about it in
# https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server
automountServiceAccountToken: false

# Duckling specific settings
duckling:
# override the default command to run in the container
Expand Down Expand Up @@ -437,6 +462,11 @@ duckling:
# resources which duckling is required / allowed to use
resources: {}

# automountServiceAccountToken specifies whether the Kubernetes service account
# credentials should be automatically mounted into the pods. See more about it in
# https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/#use-the-default-service-account-to-access-the-api-server
automountServiceAccountToken: false

# rasaSecret object which supplies passwords, tokens, etc. See
# https://rasa.com/docs/rasa-x/openshift-kubernetes/#providing-access-credentials-using-an-external-secret
# to see which values are required in the secret in case you want to provide your own.
Expand Down

0 comments on commit 4b42b16

Please sign in to comment.