Merge branch '1066-nextcloud-time-to-first-byte-ttfb-too-long-enable-caching' into 'main'

Resolve "Nextcloud time to first byte (TTFB) too long - enable caching"

Closes #1066

See merge request !252

.pre-commit-config.yaml

+# https://pre-commit.com/
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: check-added-large-files
+      - id: check-ast
+      - id: check-merge-conflict
+      - id: detect-private-key
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+      - id: debug-statements
+
+  - repo: https://github.com/gruntwork-io/pre-commit
+    rev: v0.1.17
+    hooks:
+      - id: helmlint

CHANGELOG.md

 # Changelog
 
+## [0.13.0] - 2022-08-25
+
+* Enable redis for NC, managed by the NC dependency redis chart.
+  Onlyoffice shares the same Redis instance.
+
 ## [0.12.2] - 2022-09-28
 
 * Fix bug with installing "contacts" app

Chart.lock

@@ -5,8 +5,5 @@ dependencies:
 - name: rabbitmq
   repository: https://charts.bitnami.com/bitnami
   version: 10.3.7
-- name: redis
-  repository: https://charts.bitnami.com/bitnami
-  version: 17.3.1
 digest: sha256:6aaaccf66ca39d4b9b03275e4d544def160cd4b852742e76dc386a87f9f6253f
 generated: "2022-10-04T22:07:48.945898501Z"

Chart.yaml

@@ -3,8 +3,8 @@ apiVersion: v2
 description: |
   A helm chart for installing NextCloud and setting up ONLYOFFICE integration
 name: nextcloud-onlyoffice
-version: 0.12.4
 appVersion: NC-24.0.5-OO-7.2.0.204
+version: 0.13.0
 icon: https://cdn.rawgit.com/docker-library/docs/defa5ffc7123177acd60ddef6e16bddf694cc35f/nextcloud/logo.svg
 dependencies:
   # https://artifacthub.io/packages/helm/nextcloud/nextcloud
@@ -15,7 +15,3 @@ dependencies:
   - name: rabbitmq
     version: 10.3.7
     repository: "https://charts.bitnami.com/bitnami"
-  # https://artifacthub.io/packages/helm/bitnami/redis
-  - name: redis
-    version: 17.3.1
-    repository: "https://charts.bitnami.com/bitnami"

templates/onlyoffice-deployment.yaml

@@ -97,12 +97,21 @@ spec:
               value: "{{ .Values.global.onlyofficeDb.port }}"
             - name: DB_NAME
               value: "{{ .Values.global.onlyofficeDb.name }}"
+            {{- if .Values.nextcloud.redis.enabled }}
             - name: REDIS_SERVER_HOST
               value: "{{ .Release.Name }}-redis-master"
             - name: REDIS_SERVER_PORT
-              value: "{{ .Values.redis.master.service.ports.redis }}"
+              value: "{{ .Values.nextcloud.redis.master.service.ports.redis }}"
             - name: GENERATE_FONTS
               value: "{{ .Values.onlyoffice.generateFonts }}"
+            {{- if .Values.nextcloud.redis.auth.enabled }}
+            - name: REDIS_SERVER_PASS
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ .Release.Name }}-redis"
+                  key: "redis-password"
+            {{- end }}
+            {{- end }}
             - name: USE_UNAUTHORIZED_STORAGE
               value: "{{ .Values.onlyoffice.unauthorizedStorage }}"
             - name: ONLYOFFICE_HTTPS_HSTS_ENABLED

values-local.yaml.example

@@ -28,6 +28,10 @@ nextcloud:
     #     ## Enable mariadb persistence using Persistent Volume Claims.
     #     enabled: true
     #     size: 512Mi
+  redis:
+    auth:
+      # Shared redis password for Nextcloud and OnlyOffice
+      password: CHANGE_ME
 
   # Creates a kubernetes cronJob object that runs nextcloud's cron.php
   # every 5 minutes (*/5 * * * *)

values.yaml

@@ -20,6 +20,10 @@ nextcloud:
         CREATE DATABASE {{ .Values.global.onlyofficeDb.name }};
         GRANT ALL PRIVILEGES ON {{ .Values.global.onlyofficeDb.name }}.* TO '{{ .Values.global.onlyofficeDb.user }}'@'%';
 
+  redis:
+    enabled: true
+    architecture: standalone
+
   # Use 2 GB of storage for NC storage (maybe make configurable later?)
   persistence:
     enabled: true
@@ -189,12 +193,6 @@ onlyoffice:
     successThreshold: 1
     failureThreshold: 120
 
-redis:
-  auth:
-    # Disable redis password authentication altogether.
-    enabled: false
-  architecture: standalone
-
 rabbitmq:
   auth:
     password: password