Initcontainers, extra env and extra volumes

charts/kasm/Chart.yaml

@@ -28,4 +28,4 @@ keywords:
 maintainers:
   - name: Kasm Technologies, Inc.
     url: https://github.com/kasmtech/kasm-helm
-version: 1.1181.0
+version: 1.1181.1

charts/kasm/templates/api-deployment.yaml

@@ -59,6 +59,9 @@ spec:
       {{- with .Values.affinity }}
       affinity: {{ toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.components.api.extraVolumes }}
+      volumes: {{ toYaml . | nindent 8 }}
+      {{- end }}
       initContainers:
         - name: db-is-ready
           image: {{ $constants.api.image }}
@@ -90,6 +93,9 @@ spec:
           {{- if .Values.applySecurity }}
             {{- include "kasm.containerSecurity" . | indent 10 }}
           {{- end }}
+        {{- if .Values.components.api.initContainers }}
+          {{- toYaml .Values.components.api.initContainers | nindent 8 }}
+        {{- end }}
       containers:
         - name: {{ $constants.api.name }}-container
           image: {{ $constants.api.image }}
@@ -116,6 +122,9 @@ spec:
                   name: {{ .Release.Name }}-secrets
                   key: "db-password"
                 {{- end }}
+            {{- if .Values.components.api.extraEnv }}
+              {{- toYaml .Values.components.api.extraEnv | nindent 12 }}
+            {{- end }}
           ports:
             - name: {{ $constants.api.portName }}
               containerPort: {{ $constants.api.port }}
@@ -134,3 +143,6 @@ spec:
           {{- if .Values.applyPodSecurity }}
             {{- include "kasm.containerSecurity" . | indent 10 }}
           {{- end }}
+          {{- with .Values.components.api.extraVolumeMounts }}
+          volumeMounts: {{ toYaml . | nindent 12 }}
+          {{- end }}

charts/kasm/templates/guac-deployment.yaml

@@ -81,6 +81,9 @@ spec:
         {{- if .Values.applySecurity }}
           {{- include "kasm.containerSecurity" . | indent 10 }}
         {{- end }}
+        {{- if .Values.components.guac.initContainers }}
+          {{- toYaml .Values.components.guac.initContainers | nindent 8 }}
+        {{- end }}
       containers:
         - name: {{ $constants.guac.name }}-container
           image: {{ $constants.guac.image }}
@@ -107,19 +110,27 @@ spec:
               value: {{ $constants.guac.svc }}
             - name: SERVER_PORT
               value: {{ $constants.guac.port | quote }}
+            {{- if .Values.components.guac.extraEnv }}
+              {{- toYaml .Values.components.guac.extraEnv | nindent 12 }}
+            {{- end }}
           ports:
             - name: {{ $constants.guac.portName }}
               containerPort: {{ $constants.guac.port }}
               protocol: TCP
-          {{- if .Values.applySecurity }}
+          {{- if or .Values.applySecurity .Values.components.guac.extraVolumeMounts }}
           volumeMounts:
+            {{- if .Values.applySecurity }}
             - name: {{ $constants.guac.name }}-data
               mountPath: /tmp
             - name: {{ $constants.guac.name }}-readonly
               mountPath: /opt/kasm/current/log
               readOnly: true
             - name: {{ $constants.guac.name }}-data
               mountPath: /opt/kasm/current/tmp/guac
+            {{- end }}
+            {{- if .Values.components.guac.extraVolumeMounts }}
+              {{- toYaml .Values.components.guac.extraVolumeMounts | nindent 12 }}
+            {{- end }}
           {{- end }}
           {{- if .Values.applyHealthChecks }}
           livenessProbe:
@@ -137,13 +148,18 @@ spec:
           {{- if .Values.applySecurity }}
             {{- include "kasm.containerSecurity" . | indent 10 }}
           {{- end }}
-      {{- if .Values.applySecurity }}
+      {{- if or .Values.applySecurity .Values.components.guac.extraVolumes }}
       volumes:
+        {{- if .Values.applySecurity }}
         - name: {{ $constants.guac.name }}-data
           emptyDir:
             sizeLimit: 1Gi
         - name: {{ $constants.guac.name }}-readonly
           emptyDir:
             sizeLimit: 150Mi
+        {{- end }}
+        {{- if .Values.components.guac.extraVolumes }}
+          {{- toYaml .Values.components.guac.extraVolumes | nindent 8 }}
+        {{- end }}
       {{- end }}
 {{- end }}

charts/kasm/templates/manager-deployment.yaml

@@ -63,7 +63,11 @@ spec:
       {{- with $values.affinity }}
       affinity: {{ toYaml . | nindent 8 }}
       {{- end }}
-      initContainers: {{- include "kasm.initContainer" (dict "serviceName" $constants.api.svc "servicePort" $constants.api.port "path" "/api/__healthcheck" "schema" "http" "image" $constants.api.image) | indent 8 }}
+      initContainers:
+        {{- include "kasm.initContainer" (dict "serviceName" $constants.api.svc "servicePort" $constants.api.port "path" "/api/__healthcheck" "schema" "http" "image" $constants.api.image) | indent 8 }}
+        {{- if $values.components.manager.initContainers }}
+          {{- toYaml $values.components.manager.initContainers | nindent 8 }}
+        {{- end }}
       {{- if $values.applySecurity }}
         {{- include "kasm.containerSecurity" . | indent 10 }}
       {{- end }}
@@ -93,6 +97,9 @@ spec:
                   name: {{ $.Release.Name }}-secrets
                   key: "db-password"
                 {{- end }}
+            {{- if $values.components.manager.extraEnv }}
+              {{- toYaml $values.components.manager.extraEnv | nindent 12 }}
+            {{- end }}
           ports:
             - name: {{ printf "zn%s-%s" ($idx | toString) $constants.manager.portName }}
               containerPort: {{ $constants.manager.port }}
@@ -116,8 +123,14 @@ spec:
           volumeMounts:
             - name: {{ $constants.manager.name }}-tmp
               mountPath: /tmp
+            {{- if $values.components.manager.extraVolumeMounts }}
+              {{- toYaml $values.components.manager.extraVolumeMounts | nindent 12 }}
+            {{- end }}
       volumes:
         - name: {{ $constants.manager.name }}-tmp
           emptyDir:
             sizeLimit: 1Gi
-{{- end }}
+        {{- if $values.components.manager.extraVolumes }}
+          {{- toYaml $values.components.manager.extraVolumes | nindent 8 }}
+        {{- end }}
+{{- end }}

charts/kasm/templates/proxy-deployment.yaml

@@ -109,6 +109,9 @@ spec:
             {{- include "kasm.containerSecurity" . | indent 10 }}
           {{- end }}
         {{- end }}
+        {{- if $values.components.proxy.initContainers }}
+          {{- toYaml $values.components.proxy.initContainers | nindent 8 }}
+        {{- end }}
       containers:
         - name: {{ $constants.proxy.name }}-container
           image: {{ $constants.proxy.image }}
@@ -121,6 +124,9 @@ spec:
           {{- if $values.applySecurity }}
             {{- include "kasm.containerSecurity" . | indent 10 }}
           {{- end }}
+          {{- with $values.components.proxy.extraEnv }}
+          env: {{ toYaml . | nindent 12 }}
+          {{- end }}
           volumeMounts:
             - name: {{ $constants.proxy.name }}-cert
               mountPath: /etc/ssl/certs/kasm_nginx.crt
@@ -135,6 +141,9 @@ spec:
             - name: {{ $constants.proxy.name }}-base-config
               mountPath: /etc/nginx/nginx.conf
               subPath: nginx.conf
+            {{- if $values.components.proxy.extraVolumeMounts }}
+              {{- toYaml $values.components.proxy.extraVolumeMounts | nindent 12 }}
+            {{- end }}
             {{- if $values.applySecurity }}
             - name: {{ $constants.proxy.name }}-data
               mountPath: /var/cache/nginx
@@ -171,9 +180,12 @@ spec:
         - name: {{ $constants.proxy.name }}-services-config
           configMap:
             name: {{ $constants.proxy.name }}-services-configmap
+        {{- if $values.components.proxy.extraVolumes }}
+          {{- toYaml $values.components.proxy.extraVolumes | nindent 8 }}
+        {{- end }}
         {{- if $values.applySecurity }}
         - name: {{ $constants.proxy.name }}-data
           emptyDir:
             sizeLimit: 1Gi
         {{- end }}
-{{- end }}
+{{- end }}

charts/kasm/templates/rdp-gateway-deployment.yaml

@@ -85,6 +85,9 @@ spec:
         {{- if .Values.applySecurity }}
           {{- include "kasm.containerSecurity" . | indent 10 }}
         {{- end }}
+        {{- if .Values.components.rdpGateway.initContainers }}
+          {{- toYaml .Values.components.rdpGateway.initContainers | nindent 8 }}
+        {{- end }}
       containers:
         - name: {{ $constants.rdpGateway.name }}-container
           image: {{ $constants.rdpGateway.image }}
@@ -105,6 +108,9 @@ spec:
                   key: service-token
             - name: KUBERNETES_SERVICE_HOST
               value: "true"
+            {{- if .Values.components.rdpGateway.extraEnv }}
+              {{- toYaml .Values.components.rdpGateway.extraEnv | nindent 12 }}
+            {{- end }}
           ports:
             - name: {{ $constants.rdpGateway.portName }}
               containerPort: 5555
@@ -141,6 +147,9 @@ spec:
             - name: {{ $constants.rdpGateway.name }}-config
               mountPath: /usr/local/etc/rdpproxy/conf/passthrough.app.config.yaml
               subPath: passthrough.app.config.yaml
+            {{- if .Values.components.rdpGateway.extraVolumeMounts }}
+              {{- toYaml .Values.components.rdpGateway.extraVolumeMounts | nindent 12 }}
+            {{- end }}
       volumes:
         - name: {{ $constants.rdpGateway.name }}-cert
           secret:
@@ -151,4 +160,7 @@ spec:
         - name: {{ $constants.rdpGateway.name }}-config
           configMap:
             name: {{ $constants.rdpGateway.name }}-configmap
-{{- end }}
+        {{- if .Values.components.rdpGateway.extraVolumes }}
+          {{- toYaml .Values.components.rdpGateway.extraVolumes | nindent 8 }}
+        {{- end }}
+{{- end }}

charts/kasm/templates/rdp-https-gateway-deployment.yaml

@@ -81,6 +81,9 @@ spec:
             - name: {{ $constants.rdpHttpsGateway.name }}-data
               mountPath: /tmp
         {{- end }}
+        {{- if .Values.components.rdpHttpsGateway.initContainers }}
+          {{- toYaml .Values.components.rdpHttpsGateway.initContainers | nindent 8 }}
+        {{- end }}
       containers:
         - name: {{ $constants.rdpHttpsGateway.name }}-container
           image: {{ $constants.rdpHttpsGateway.image }}
@@ -101,6 +104,9 @@ spec:
                   key: service-token
             - name: KUBERNETES_SERVICE_HOST
               value: "true"
+            {{- if .Values.components.rdpHttpsGateway.extraEnv }}
+              {{- toYaml .Values.components.rdpHttpsGateway.extraEnv | nindent 12 }}
+            {{- end }}
           ports:
             - name: {{ $constants.rdpHttpsGateway.portName }}
               containerPort: {{ $constants.rdpHttpsGateway.port }}
@@ -132,11 +138,17 @@ spec:
               mountPath: /opt/kasm/current/log
             - name: {{ $constants.rdpHttpsGateway.name }}-data
               mountPath: /tmp
+            {{- if .Values.components.rdpHttpsGateway.extraVolumeMounts }}
+              {{- toYaml .Values.components.rdpHttpsGateway.extraVolumeMounts | nindent 12 }}
+            {{- end }}
       volumes:
         - name: {{ $constants.rdpHttpsGateway.name }}-cert
           secret:
             secretName: {{ .Values.certificate.secretName }}
         - name: {{ $constants.rdpHttpsGateway.name }}-data
           emptyDir:
             sizeLimit: 150Mi
-{{- end }}
+        {{- if .Values.components.rdpHttpsGateway.extraVolumes }}
+          {{- toYaml .Values.components.rdpHttpsGateway.extraVolumes | nindent 8 }}
+        {{- end }}
+{{- end }}