Merge pull request #348 from RasaHQ/infra-534

Add additional containers for deployments

charts/rasa-x/Chart.yaml

@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
 
-version: "4.5.22"
+version: "4.5.23"
 
 appVersion: "1.2.2"
 

charts/rasa-x/templates/app-deployment.yaml

@@ -86,6 +86,9 @@ spec:
         volumeMounts:
 {{ toYaml .Values.app.extraVolumeMounts | indent 8 }}
 {{- end }}
+      {{- if .Values.eventService.additionalContainers }}
+        {{- toYaml .Values.eventService.additionalContainers | nindent 6 }}
+      {{- end }}
 {{- if .Values.app.extraVolumes }}
       volumes:
 {{ toYaml .Values.app.extraVolumes | indent 6 }}

charts/rasa-x/templates/db-migration-service-deployment.yaml

@@ -95,6 +95,9 @@ spec:
         resources:
           {{- toYaml . | nindent 10 }}
         {{- end }}
+      {{- if .Values.dbMigrationService.additionalContainers }}
+        {{- toYaml .Values.dbMigrationService.additionalContainers | nindent 6 }}
+      {{- end }}
 {{- if .Values.dbMigrationService.extraVolumes }}
       volumes:
 {{ toYaml .Values.dbMigrationService.extraVolumes | indent 6 }}

charts/rasa-x/templates/duckling-deployment.yaml

@@ -80,6 +80,9 @@ spec:
         volumeMounts:
 {{ toYaml .Values.duckling.extraVolumeMounts | indent 8 }}
         {{- end }}
+      {{- if .Values.eventService.additionalContainers }}
+        {{- toYaml .Values.eventService.additionalContainers | nindent 6 }}
+      {{- end }}
       {{ if .Values.duckling.extraVolumes }}
       volumes:
 {{ toYaml .Values.duckling.extraVolumes | indent 6 }}

charts/rasa-x/templates/event-service-deployment.yaml

@@ -127,6 +127,9 @@ spec:
         - mountPath: "/app/endpoints.yml"
           subPath: "endpoints.yml"
           name: "rasa-configuration"
+      {{- if .Values.eventService.additionalContainers }}
+        {{- toYaml .Values.eventService.additionalContainers | nindent 6 }}
+      {{- end }}
       volumes:
 {{- if .Values.eventService.extraVolumes }}
 {{ toYaml .Values.eventService.extraVolumes | indent 6 }}

charts/rasa-x/templates/rasa-deployments.yaml

@@ -180,6 +180,9 @@ spec:
 {{- if .extraVolumeMounts }}
 {{ toYaml .extraVolumeMounts | indent 8 }}
 {{- end }}
+      {{- if $.Values.rasa.additionalContainers }}
+        {{- toYaml $.Values.rasa.additionalContainers | nindent 6 }}
+      {{- end }}
       volumes:
       - name: config-dir
         emptyDir: {}

charts/rasa-x/templates/rasa-x-deployment.yaml

@@ -198,6 +198,9 @@ spec:
         resources:
           {{- toYaml . | nindent 10 }}
         {{- end }}
+      {{- if .Values.rasax.additionalContainers }}
+        {{- toYaml .Values.rasax.additionalContainers | nindent 6 }}
+      {{- end }}
       volumes:
 {{- if .Values.rasax.extraVolumes }}
 {{ toYaml .Values.rasax.extraVolumes | indent 6 }}

charts/rasa-x/values.yaml

@@ -76,6 +76,12 @@ rasax:
   # - name: SOME_CUSTOM_ENV_VAR
   #   value: "custom value"
 
+  # -- rasax.additionalContainers allows to specify additional containers for the Rasa X Deployment
+  additionalContainers: []
+    # - name: extra
+    #   image: "busybox"
+    #   command: ["bash", "-c"]
+
   # additional volumeMounts to the main container
   extraVolumeMounts: []
   # - name: tmpdir
@@ -255,6 +261,12 @@ rasa:
   # - name: tmpdir
   #   emptyDir: {}
 
+  # -- rasa.additionalContainers allows to specify additional containers for the Rasa Deployment
+  additionalContainers: []
+    # - name: extra
+    #   image: "busybox"
+    #   command: ["bash", "-c"]
+
   # versions of the Rasa container which are running
   versions:
     # rasaProduction is the container which serves the production environment
@@ -398,6 +410,12 @@ dbMigrationService:
   # - name: tmpdir
   #   emptyDir: {}
 
+  # -- dbMigrationService.additionalContainers allows to specify additional containers
+  additionalContainers: []
+    # - name: extra
+    #   image: "busybox"
+    #   command: ["bash", "-c"]
+
   # 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
@@ -476,6 +494,12 @@ eventService:
   # - name: tmpdir
   #   emptyDir: {}
 
+  # -- eventService.additionalContainers allows to specify additional containers
+  additionalContainers: []
+    # - name: extra
+    #   image: "busybox"
+    #   command: ["bash", "-c"]
+
   # livenessProbe checks whether the event service needs to be restarted
   livenessProbe:
     enabled: true
@@ -562,6 +586,12 @@ app:
   # - name: tmpdir
   #   emptyDir: {}
 
+  # -- app.additionalContainers allows to specify additional containers
+  additionalContainers: []
+    # - name: extra
+    #   image: "busybox"
+    #   command: ["bash", "-c"]
+
   # 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
@@ -740,6 +770,12 @@ duckling:
   # - name: tmpdir
   #   emptyDir: {}
 
+  # -- duckling.additionalContainers allows to specify additional containers
+  additionalContainers: []
+    # - name: extra
+    #   image: "busybox"
+    #   command: ["bash", "-c"]
+
   # 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