Merge Helm Chart release/v3.1.0 into master

Author: agolybev

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 3.1.0
+
+### New Features
+
+* Added the ability set up Horizontal Pod Autoscaling
+* Added the `global.installationType` parameter, which also affects the edition type (Community/Enterprise/Developer) of the built-in Docs if its installation is enabled (docs.enabled=true)
+* Added the ability to set additional custom env variables for containers
+* Added the ability to add additional custom volumes for containers
+
+### Changes
+
+* Released ONLYOFFICE DocSpace v3.0.4
+* The `connections.installationType` parameter has been replaced with `global.installationType`. The value for `connections.installationType` is now derived from `global.installationType`
+
 ## 3.0.1
 
 ### Changes

Chart.yaml

@@ -4,8 +4,8 @@ description: Helm chart for installing ONLYOFFICE DocSpace in Kubernetes
 type: application
 dependencies:
 - name: docs
-  version: 4.4.1
+  version: 4.5.0
   repository: https://download.onlyoffice.com/charts/stable
   condition: docs.enabled
-version: 3.0.1
-appVersion: 3.0.1
+version: 3.1.0
+appVersion: 3.0.4

README.md

@@ -34,7 +34,7 @@
 redisPort = os.environ.get('REDIS_PORT')
 redisUser = os.environ.get('REDIS_USER_NAME')
 redisPassword = os.environ.get('REDIS_PASSWORD')
-redisDBNum = '0'
+redisDBNum = os.environ.get('REDIS_DB')
 redisConnectTimeout = 15
 
 dbType = 'mysql'

sources/scripts/test_docspace.py

@@ -1,3 +1,16 @@
+{{/*
+Check the Installation type
+*/}}
+{{- define "docspace.installation.type" -}}
+{{- $installationType := .Values.global.installationType -}}
+{{- $possibleInstallationTypes := list "COMMUNITY" "DEVELOPER" "ENTERPRISE" -}}
+{{- if has $installationType $possibleInstallationTypes }}
+    {{- $installationType -}}
+{{- else -}}
+    {{- fail "You have specified an unsupported Installation type! Possible values: COMMUNITY, DEVELOPER and ENTERPRISE" -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Get the DocSpace Namespace
 */}}

templates/_helpers.tpl

@@ -14,7 +14,9 @@ metadata:
   annotations: {{- include "docspace.annotations" ( dict "keyName" $dictValue "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
+  {{- if not .Values.apiSystem.autoscaling.enabled }}
   replicas: {{ .Values.apiSystem.replicaCount }}
+  {{- end }}
   selector:
     matchLabels:
       app: api-system
@@ -182,6 +184,9 @@ spec:
             secretKeyRef:
               name: {{ template "docspace.jwt.secretName" . }}
               key: JWT_HEADER
+        {{- with .Values.apiSystem.extraEnvVars }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         envFrom:
         - configMapRef:
             name: docspace
@@ -198,6 +203,9 @@ spec:
           subPath: {{ . }}
         {{- end }}
         {{- end }}
+        {{- with .Values.apiSystem.extraVolumeMounts }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         - name: docspace-data
           mountPath: /app/{{ .Values.product.name }}/data
         - name: files-data
@@ -210,6 +218,9 @@ spec:
         secret:
           secretName: {{ .Values.extraConf.secretName }}
       {{- end }}
+      {{- with .Values.apiSystem.extraVolumes }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       - name: docspace-data
         persistentVolumeClaim:
           claimName: {{ template "docspace.pvc.data.name" . }}

templates/applications/api-system.yaml

@@ -14,7 +14,9 @@ metadata:
   annotations: {{- include "docspace.annotations" ( dict "keyName" $dictValue "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
+  {{- if not .Values.api.autoscaling.enabled }}
   replicas: {{ .Values.api.replicaCount }}
+  {{- end }}
   selector:
     matchLabels:
       app: api
@@ -182,6 +184,9 @@ spec:
             secretKeyRef:
               name: {{ template "docspace.jwt.secretName" . }}
               key: JWT_HEADER
+        {{- with .Values.api.extraEnvVars }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         envFrom:
         - configMapRef:
             name: docspace
@@ -198,6 +203,9 @@ spec:
           subPath: {{ . }}
         {{- end }}
         {{- end }}
+        {{- with .Values.api.extraVolumeMounts }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         - name: docspace-data
           mountPath: /app/{{ .Values.product.name }}/data
         - name: files-data
@@ -210,6 +218,9 @@ spec:
         secret:
           secretName: {{ .Values.extraConf.secretName }}
       {{- end }}
+      {{- with .Values.api.extraVolumes }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       - name: docspace-data
         persistentVolumeClaim:
           claimName: {{ template "docspace.pvc.data.name" . }}

templates/applications/api.yaml

@@ -14,7 +14,9 @@ metadata:
   annotations: {{- include "docspace.annotations" ( dict "keyName" $dictValue "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
+  {{- if not .Values.backupBackgroundTasks.autoscaling.enabled }}
   replicas: {{ .Values.backupBackgroundTasks.replicaCount }}
+  {{- end }}
   selector:
     matchLabels:
       app: backup-background-tasks
@@ -182,6 +184,9 @@ spec:
             secretKeyRef:
               name: {{ template "docspace.jwt.secretName" . }}
               key: JWT_HEADER
+        {{- with .Values.backupBackgroundTasks.extraEnvVars }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         envFrom:
         - configMapRef:
             name: docspace
@@ -198,6 +203,9 @@ spec:
           subPath: {{ . }}
         {{- end }}
         {{- end }}
+        {{- with .Values.backupBackgroundTasks.extraVolumeMounts }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         - name: docspace-data
           mountPath: /app/{{ .Values.product.name }}/data
         - name: files-data
@@ -210,6 +218,9 @@ spec:
         secret:
           secretName: {{ .Values.extraConf.secretName }}
       {{- end }}
+      {{- with .Values.backupBackgroundTasks.extraVolumes }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       - name: docspace-data
         persistentVolumeClaim:
           claimName: {{ template "docspace.pvc.data.name" . }}

templates/applications/backup-background-tasks.yaml

@@ -14,7 +14,9 @@ metadata:
   annotations: {{- include "docspace.annotations" ( dict "keyName" $dictValue "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
+  {{- if not .Values.backup.autoscaling.enabled }}
   replicas: {{ .Values.backup.replicaCount }}
+  {{- end }}
   selector:
     matchLabels:
       app: backup
@@ -182,6 +184,9 @@ spec:
             secretKeyRef:
               name: {{ template "docspace.jwt.secretName" . }}
               key: JWT_HEADER
+        {{- with .Values.backup.extraEnvVars }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         envFrom:
         - configMapRef:
             name: docspace
@@ -198,6 +203,9 @@ spec:
           subPath: {{ . }}
         {{- end }}
         {{- end }}
+        {{- with .Values.backup.extraVolumeMounts }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         - name: docspace-data
           mountPath: /app/{{ .Values.product.name }}/data
         - name: files-data
@@ -210,6 +218,9 @@ spec:
         secret:
           secretName: {{ .Values.extraConf.secretName }}
       {{- end }}
+      {{- with .Values.backup.extraVolumes }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       - name: docspace-data
         persistentVolumeClaim:
           claimName: {{ template "docspace.pvc.data.name" . }}

templates/applications/backup.yaml

@@ -14,7 +14,9 @@ metadata:
   annotations: {{- include "docspace.annotations" ( dict "keyName" $dictValue "context" $ ) | nindent 4 }}
   {{- end }}
 spec:
+  {{- if not .Values.clearEvents.autoscaling.enabled }}
   replicas: {{ .Values.clearEvents.replicaCount }}
+  {{- end }}
   selector:
     matchLabels:
       app: clear-events
@@ -182,6 +184,9 @@ spec:
             secretKeyRef:
               name: {{ template "docspace.jwt.secretName" . }}
               key: JWT_HEADER
+        {{- with .Values.clearEvents.extraEnvVars }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         envFrom:
         - configMapRef:
             name: docspace
@@ -198,6 +203,9 @@ spec:
           subPath: {{ . }}
         {{- end }}
         {{- end }}
+        {{- with .Values.clearEvents.extraVolumeMounts }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
         - name: docspace-data
           mountPath: /app/{{ .Values.product.name }}/data
         - name: files-data
@@ -210,6 +218,9 @@ spec:
         secret:
           secretName: {{ .Values.extraConf.secretName }}
       {{- end }}
+      {{- with .Values.clearEvents.extraVolumes }}
+      {{- toYaml . | nindent 6 }}
+      {{- end }}
       - name: docspace-data
         persistentVolumeClaim:
           claimName: {{ template "docspace.pvc.data.name" . }}