Merge pull request #322 from ONLYOFFICE/release/v4.2.1

Merge Helm Chart release/v4.2.1 into master

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change log
 
+## 4.2.1
+
+### Changes
+
+* Changed the default value for `converter.updateStrategy.type` to `Recreate`
+* Released ONLYOFFICE Docs [v8.1.1](https://github.com/ONLYOFFICE/DocumentServer/blob/master/CHANGELOG.md#811)
+
+### Fixes
+
+* Fixed a bug related to cases when the installation/update continued with database tables recreation errors, an additional check of database availability is added in Jobs scripts
+
 ## 4.2.0
 
 ### New Features

Chart.yaml

@@ -4,6 +4,6 @@ description: Helm chart for installing ONLYOFFICE Docs in Kubernetes
 
 type: application
 
-version: 4.2.0
+version: 4.2.1
 
-appVersion: 8.1.0
+appVersion: 8.1.1

sources/shutdown-ds.yaml

@@ -13,7 +13,7 @@ spec:
           defaultMode: 0755
       containers:
         - name: shutdown-ds
-          image: onlyoffice/docs-utils:8.1.0-1
+          image: onlyoffice/docs-utils:8.1.1-1
           command: ["/bin/sh", "-c"]
           args: ["/scripts/stop.sh"]
           volumeMounts:

templates/configmaps/pre-delete.yaml

@@ -34,6 +34,8 @@ data:
     if [ $? -ne 0 ]; then	
       echo -e "\e[0;31m DB is not available \e[0m"
       exit 1
+    else
+      echo -e "\e[0;32m Successful connection to the DB \e[0m"
     fi
     {{- if not .Values.persistence.storageS3 }}
     FILES_DIR=/var/lib/{{ .Values.product.name }}/documentserver/App_Data/cache/files/
@@ -67,6 +69,7 @@ data:
       --port={{ .Values.connections.dbPort }} \
       --user={{ .Values.connections.dbUser }} \
       --dbname={{ .Values.connections.dbName }} \
+      --variable=ON_ERROR_STOP=ON \
       --file=/scripts/{{ .Values.delete.existingConfigmap.tblRemove.keyName }}
     {{- else if or (eq .Values.connections.dbType "mysql") (eq .Values.connections.dbType "mariadb") }}
     mysql -h {{ .Values.connections.dbHost }} \
@@ -75,5 +78,8 @@ data:
       -p$DB_PWD \
       {{ .Values.connections.dbName }} < /scripts/{{ .Values.delete.existingConfigmap.tblRemove.keyName }}
     {{- end }}
+    if [ $? -ne 0 ]; then
+      echo -e "\e[0;31m The DATABASE cleanup script could not be executed. Skipping... \e[0m"
+    fi
     echo work done
 {{- end }}

templates/configmaps/pre-install.yaml

@@ -33,6 +33,8 @@ data:
     if [ $? -ne 0 ]; then	
       echo -e "\e[0;31m DB is not available \e[0m"
       exit 1
+    else
+      echo -e "\e[0;32m Successful connection to the database \e[0m"
     fi
     if [[ "$PRIVATE_CLUSTER" != "true" ]]; then
       wget -O /scripts/{{ .Values.install.existingConfigmap.tblCreate.keyName }} \
@@ -47,6 +49,7 @@ data:
       --port={{ .Values.connections.dbPort }} \
       --user={{ .Values.connections.dbUser }} \
       --dbname={{ .Values.connections.dbName }} \
+      --variable=ON_ERROR_STOP=ON \
       --file=/scripts/{{ .Values.install.existingConfigmap.tblCreate.keyName }}
     {{- else if or (eq .Values.connections.dbType "mysql") (eq .Values.connections.dbType "mariadb") }}
     mysql -h {{ .Values.connections.dbHost }} \
@@ -55,5 +58,9 @@ data:
       -p$DB_PWD \
       {{ .Values.connections.dbName }} < /scripts/{{ .Values.install.existingConfigmap.tblCreate.keyName }}
     {{- end }}
+    if [ $? -ne 0 ]; then
+      echo -e "\e[0;31m The DATABASE initialization script could not be executed \e[0m"
+      exit 1
+    fi
     echo work done
 {{- end }}

templates/configmaps/pre-rollback.yaml

@@ -33,6 +33,8 @@ data:
     if [ $? -ne 0 ]; then	
       echo -e "\e[0;31m DB is not available \e[0m"
       exit 1
+    else
+      echo -e "\e[0;32m Successful connection to the DB \e[0m"
     fi
     {{- if not .Values.persistence.storageS3 }}
     FILES_DIR=/var/lib/{{ .Values.product.name }}/documentserver/App_Data/cache/files/
@@ -72,11 +74,13 @@ data:
       --port={{ .Values.connections.dbPort }} \
       --user={{ .Values.connections.dbUser }} \
       --dbname={{ .Values.connections.dbName }} \
+      --variable=ON_ERROR_STOP=ON \
       --file=/scripts/{{ .Values.rollback.existingConfigmap.tblRemove.keyName }}
     PGPASSWORD=$DB_PWD psql --host={{ .Values.connections.dbHost }} \
       --port={{ .Values.connections.dbPort }} \
       --user={{ .Values.connections.dbUser }} \
       --dbname={{ .Values.connections.dbName }} \
+      --variable=ON_ERROR_STOP=ON \
       --file=/scripts/{{ .Values.rollback.existingConfigmap.tblCreate.keyName }}
     {{- else if or (eq .Values.connections.dbType "mysql") (eq .Values.connections.dbType "mariadb") }}
     mysql -h {{ .Values.connections.dbHost }} \
@@ -90,5 +94,9 @@ data:
       -p$DB_PWD \
       {{ .Values.connections.dbName }} < /scripts/{{ .Values.rollback.existingConfigmap.tblCreate.keyName }}
     {{- end }}
+    if [ $? -ne 0 ]; then
+      echo -e "\e[0;31m The DATABASE preparation scripts could not be executed \e[0m"
+      exit 1
+    fi
     echo work done
 {{- end }}

templates/configmaps/pre-upgrade.yaml

@@ -38,6 +38,8 @@ data:
       if [ $? -ne 0 ]; then
         echo -e "\e[0;31m DB is not available \e[0m"
         exit 1
+      else
+        echo -e "\e[0;32m Successful connection to the DB \e[0m"
       fi
       if [[ "$PRIVATE_CLUSTER" != "true" ]]; then
         wget -O /scripts/{{ .Values.upgrade.existingConfigmap.tblRemove.keyName }} \
@@ -58,11 +60,13 @@ data:
         --port={{ .Values.connections.dbPort }} \
         --user={{ .Values.connections.dbUser }} \
         --dbname={{ .Values.connections.dbName }} \
+        --variable=ON_ERROR_STOP=ON \
         --file=/scripts/{{ .Values.upgrade.existingConfigmap.tblRemove.keyName }}
       PGPASSWORD=$DB_PWD psql --host={{ .Values.connections.dbHost }} \
         --port={{ .Values.connections.dbPort }} \
         --user={{ .Values.connections.dbUser }} \
         --dbname={{ .Values.connections.dbName }} \
+        --variable=ON_ERROR_STOP=ON \
         --file=/scripts/{{ .Values.upgrade.existingConfigmap.tblCreate.keyName }}
       {{- else if or (eq .Values.connections.dbType "mysql") (eq .Values.connections.dbType "mariadb") }}
       mysql -h {{ .Values.connections.dbHost }} \
@@ -76,6 +80,10 @@ data:
         -p$DB_PWD \
         {{ .Values.connections.dbName }} < /scripts/{{ .Values.upgrade.existingConfigmap.tblCreate.keyName }}
       {{- end }}
+      if [ $? -ne 0 ]; then
+        echo -e "\e[0;31m The DATABASE preparation scripts could not be executed \e[0m"
+        exit 1
+      fi
       echo work done
     fi
 {{- end }}

values.yaml

@@ -488,7 +488,7 @@ docservice:
     ## https://github.com/ONLYOFFICE/Kubernetes-Docs#4-parameters
     repository: onlyoffice/docs-docservice-de
     ## docservice.image.tag docservice container image tag
-    tag: 8.1.0-1
+    tag: 8.1.1-1
     ## docservice.image.pullPolicy docservice container image pull policy
     pullPolicy: IfNotPresent
   ## Configure a Security Context for the Docservice container
@@ -637,7 +637,7 @@ proxy:
     ## https://github.com/ONLYOFFICE/Kubernetes-Docs#4-parameters
     repository: onlyoffice/docs-proxy-de
     ## proxy.image.tag proxy container image tag
-    tag: 8.1.0-1
+    tag: 8.1.1-1
     ## proxy.image.pullPolicy proxy container image pull policy
     pullPolicy: IfNotPresent
   ## Configure a Security Context for the Proxy container
@@ -752,13 +752,7 @@ converter:
   ## Update strategy used to replace old Pods by new ones. Allowed values: `RollingUpdate` or `Recreate`
   ## converter.updateStrategy.type Docservice deployment update strategy type
   updateStrategy:
-    type: RollingUpdate
-    ## converter.updateStrategy.rollingUpdate Used only when `converter.updateStrategy.type=RollingUpdate`
-    rollingUpdate:
-      ## converter.updateStrategy.rollingUpdate.maxUnavailable Maximum number of Converter Pods unavailable during the update process
-      maxUnavailable: 25%
-      ## converter.updateStrategy.rollingUpdate.maxSurge Maximum number of Converter Pods created over the desired number of Pods
-      maxSurge: 25%
+    type: Recreate
   ## converter.customPodAntiAffinity Prohibiting the scheduling of Converter Pods relative to other Pods containing the specified labels on the same node
   ## Example:
   ## customPodAntiAffinity:
@@ -885,7 +879,7 @@ converter:
     ## https://github.com/ONLYOFFICE/Kubernetes-Docs#4-parameters
     repository: onlyoffice/docs-converter-de
     ## converter.image.tag converter container image tag
-    tag: 8.1.0-1
+    tag: 8.1.1-1
     ## converter.image.pullPolicy converter container image pull policy
     pullPolicy: IfNotPresent
   ## Configure a Security Context for the Converter container
@@ -1022,7 +1016,7 @@ example:
     ## example.image.repository example container image name
     repository: onlyoffice/docs-example
     ## example.image.tag example container image tag
-    tag: 8.1.0-1
+    tag: 8.1.1-1
     ## example.image.pullPolicy example container image pull policy
     pullPolicy: IfNotPresent
   ## Configure a Security Context for the Example container
@@ -1162,7 +1156,7 @@ install:
       ## install.job.image.repository Job by pre-install ONLYOFFICE Docs image repository
       repository: onlyoffice/docs-utils
       ## install.job.image.tag Job by pre-install ONLYOFFICE Docs image tag
-      tag: 8.1.0-1
+      tag: 8.1.1-1
       ## install.job.image.pullPolicy Job by pre-install ONLYOFFICE Docs image pull policy
       pullPolicy: IfNotPresent
     ## Configure a Security Context for the pre-install container
@@ -1243,7 +1237,7 @@ upgrade:
       ## upgrade.job.image.repository Job by upgrade image repository
       repository: onlyoffice/docs-utils
       ## upgrade.job.image.tag Job by upgrade image tag
-      tag: 8.1.0-1
+      tag: 8.1.1-1
       ## upgrade.job.image.pullPolicy Job by upgrade image pull policy
       pullPolicy: IfNotPresent
     ## Configure a Security Context for the pre-upgrade container
@@ -1332,7 +1326,7 @@ rollback:
       ## rollback.job.image.repository Job by rollback image repository
       repository: onlyoffice/docs-utils
       ## rollback.job.image.tag Job by rollback image tag
-      tag: 8.1.0-1
+      tag: 8.1.1-1
       ## rollback.job.image.pullPolicy Job by rollback image pull policy
       pullPolicy: IfNotPresent
     ## Configure a Security Context for the pre-rollback container
@@ -1421,7 +1415,7 @@ delete:
       ## delete.job.image.repository Job by delete image repository
       repository: onlyoffice/docs-utils
       ## delete.job.image.tag Job by delete image tag
-      tag: 8.1.0-1
+      tag: 8.1.1-1
       ## delete.job.image.pullPolicy Job by delete image pull policy
       pullPolicy: IfNotPresent
     ## Configure a Security Context for the pre-delete container
@@ -1502,7 +1496,7 @@ clearCache:
       ## clearCache.job.image.repository Job by Clear Cache ONLYOFFICE Docs image repository
       repository: onlyoffice/docs-utils
       ## clearCache.job.image.tag Job by Clear Cache ONLYOFFICE Docs image tag
-      tag: 8.1.0-1
+      tag: 8.1.1-1
       ## clearCache.job.image.pullPolicy Job by Clear Cache ONLYOFFICE Docs image pull policy
       pullPolicy: IfNotPresent
     ## Configure a Security Context for the Clear Cache container
@@ -1576,7 +1570,7 @@ grafanaDashboard:
       ## grafanaDashboard.job.image.repository Job by Grafana Dashboard ONLYOFFICE Docs image repository
       repository: onlyoffice/docs-utils
       ## grafanaDashboard.job.image.tag Job by Grafana Dashboard ONLYOFFICE Docs image tag
-      tag: 8.1.0-1
+      tag: 8.1.1-1
       ## grafanaDashboard.job.image.pullPolicy Job by Grafana Dashboard ONLYOFFICE Docs image pull policy
       pullPolicy: IfNotPresent
     ## Configure a Security Context for the Grafana Dashboard container
@@ -1642,7 +1636,7 @@ tests:
     ## tests.image.repository test container image name
     repository: onlyoffice/docs-utils
     ## tests.image.tag test container image tag
-    tag: 8.1.0-1
+    tag: 8.1.1-1
     ## tests.image.pullPolicy test container image pull policy
     pullPolicy: IfNotPresent
   ## Configure a Security Context for the Test container