monicahq · asbiin · Nov 9, 2024 · Nov 9, 2024
diff --git a/.github/tests/redis.yaml b/.github/tests/redis.yaml
@@ -1,9 +1,5 @@
 redis:
   enabled: true
-  architecture: standalone
-  master:
-    persistence:
-      enabled: false
 
 internalDatabase:
   enabled: false

diff --git a/charts/monica/Chart.yaml b/charts/monica/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: monica
 description: A Helm chart for Kubernetes to install Monica
 type: application
-version: 1.0.12
+version: 1.0.13
 appVersion: "5.0.0"
 icon: https://raw.githubusercontent.com/monicahq/monica/aa98c09/public/img/favicon.svg
 maintainers:
@@ -54,6 +54,7 @@ annotations:
       image: ghcr.io/monicahq/monica-next:main
       platforms:
         - linux/amd64
+        - linux/arm64
   artifacthub.io/license: AGPL-3.0
   artifacthub.io/links: |
     - name: Helm Charts Source
@@ -63,11 +64,7 @@ annotations:
     - name: Source Code
       url: https://github.com/monicahq/monica
   artifacthub.io/changes: |
-    - kind: changed
-      description: Update chart documentation
-    - kind: fixed
-      description: Fix resources usage
-    - kind: added
-      description: Add resources for cronjob and queue
-    - kind: changed
-      description: Renamed 'hpa' to 'autoscaling', and its child values
+    - kind: changes
+      description: Activate redis storage by default
+    - kind: fix
+      description: Fix annotations
diff --git a/charts/monica/README.md b/charts/monica/README.md
@@ -1,6 +1,6 @@
 # monica
 
-![Version: 1.0.12](https://img.shields.io/badge/Version-1.0.12-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.0.0](https://img.shields.io/badge/AppVersion-5.0.0-informational?style=flat-square)
+![Version: 1.0.13](https://img.shields.io/badge/Version-1.0.13-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 5.0.0](https://img.shields.io/badge/AppVersion-5.0.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes to install Monica
 
@@ -70,12 +70,13 @@ Kubernetes: `>=1.16.0-0`
 | image.pullSecrets | list | `[]` | Optionally specify an array of imagePullSecrets. |
 | image.repository | string | `"ghcr.io/monicahq/monica-next"` | The monica image repository to pull from |
 | image.tag | string | `"main"` | The monica image tag to pull |
-| ingress.annotations | object | `{}` | An array of service annotations |
+| ingress.annotations | object | `{}` | Ingress service annotations |
 | ingress.className | string | `""` | Name of the ingress class to use |
 | ingress.enabled | bool | `false` | Enable ingress controller resource |
 | ingress.labels | object | `{}` | An array of service labels |
 | ingress.path | string | `"/"` | The Path to use in Ingress' paths |
 | ingress.pathType | string | `"Prefix"` | The PathType to use in Ingress' paths |
+| ingress.tls | list | `[]` | Ingress TLS configuration |
 | internalDatabase.enabled | bool | `true` | Enable internal (SQLite) database |
 | internalDatabase.name | string | `"/var/www/html/database/monica.sqlite"` | Database fullpath file |
 | lifecycle | object | `{}` | Allow configuration of lifecycle hooks. ref: https://kubernetes.io/docs/tasks/configure-pod-container/attach-handler-lifecycle-event/ |
@@ -98,6 +99,8 @@ Kubernetes: `>=1.16.0-0`
 | meilisearch.enabled | bool | `false` | Enable Meilisearch. Use with `SCOUT_DRIVER=meilisearch` and `SCOUT_QUEUE=true` variables. |
 | meilisearch.environment.MEILI_ENV | string | `"production"` |  |
 | memcached.auth.enabled | bool | `true` | Enable memcached authentication |
+| memcached.auth.existingSecret | string | `""` | Name of an existing secret with Memcached credentials (instead of auth.password), must be created ahead of time |
+| memcached.auth.existingSecretPasswordKey | string | `""` | Password key to be retrieved from existing secret |
 | memcached.auth.password | string | `"secret"` | Memcached password |
 | memcached.auth.username | string | `"monica"` | Memcached user |
 | memcached.containerSecurityContext | object | `{}` |  |
@@ -159,8 +162,11 @@ Kubernetes: `>=1.16.0-0`
 | readinessProbe.successThreshold | int | `1` | Minimum consecutive successes for the probe |
 | readinessProbe.timeoutSeconds | int | `5` | When the probe times out |
 | redis.auth.enabled | bool | `true` | Enable redis authentication |
+| redis.auth.existingSecret | string | `""` | Name of an existing secret with Redis credentials (instead of auth.password), must be created ahead of time |
+| redis.auth.existingSecretPasswordKey | string | `""` | Password key to be retrieved from existing secret |
 | redis.auth.password | string | `"secret"` | Redis password |
 | redis.enabled | bool | `false` | Enable Redis. Use with a `QUEUE_CONNECTION=redis` variable (can also be used for `CACHE_STORE` and `SESSION_DRIVER`). |
+| redis.global.storageClass | string | `""` | Storage class of backing PVC for Redis |
 | replicaCount | int | `1` | Number of pods to be deployed |
 | resources | object | `{}` | Define resources requests and limits for the pod (limits, requests) |
 | service.annotations | object | `{}` | Service annotations |

diff --git a/charts/monica/templates/cronjob.yaml b/charts/monica/templates/cronjob.yaml
@@ -32,7 +32,7 @@ spec:
                 - -c
                 - php /var/www/html/artisan schedule:run -v
               env:
-                {{- include "monica.env" . | indent 16 }}
+                {{- include "monica.env" . | nindent 16 }}
               resources:
                 {{- toYaml .Values.monica.cronjob.resources | nindent 16 }}
               volumeMounts:

diff --git a/charts/monica/templates/deployment.yaml b/charts/monica/templates/deployment.yaml
@@ -7,18 +7,18 @@ metadata:
     {{- include "monica.labels" . | nindent 4 }}
     app.kubernetes.io/component: app
     {{- with .Values.deploymentLabels }}
-    {{ toYaml . | indent 4 }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
   {{- with .Values.deploymentAnnotations }}
   annotations:
-    {{ toYaml . | indent 4 }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
   strategy:
-    {{ toYaml .Values.monica.strategy | indent 4 }}
+    {{- toYaml .Values.monica.strategy | nindent 4 }}
   selector:
     matchLabels:
       {{- include "monica.selectorLabels" . | nindent 6 }}
@@ -35,15 +35,15 @@ spec:
         {{ template "monica.memcached.fullname" . }}-client: "true"
         {{- end }}        
         {{- with .Values.podLabels }}
-        {{ toYaml . | indent 8 }}
+        {{- toYaml . | nindent 8 }}
         {{- end }}
       annotations:
         php-config-hash: {{ toJson .Values.monica.phpConfigs | sha256sum }}
         {{- if .Values.nginx.enabled }}
         nginx-config-hash: {{ print .Values.nginx.config.default "-" .Values.nginx.config.custom | sha256sum }}
         {{- end }}      
         {{- with .Values.podAnnotations }}
-        {{ toYaml . | indent 8 }}
+        {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:
       {{- with .Values.image.pullSecrets }}
@@ -72,7 +72,7 @@ spec:
             {{- end }}
           {{- end }}
           env:
-            {{- include "monica.env" . | indent 12 }}
+            {{- include "monica.env" . | nindent 12 }}
           {{- if not .Values.nginx.enabled }}
           ports:
             - name: http
@@ -207,7 +207,7 @@ spec:
               mountPath: {{ .Values.monica.storagedir }}
             {{- end }}
             {{- with .Values.monica.extraVolumeMounts }}
-            {{ toYaml . | indent 12 }}
+            {{- toYaml . | nindent 12 }}
             {{- end }}
         {{- end }}{{/* nginx.enabled */}}
 

diff --git a/charts/monica/templates/ingress.yaml b/charts/monica/templates/ingress.yaml
@@ -8,11 +8,11 @@ metadata:
     {{- include "monica.labels" . | nindent 4 }}
     app.kubernetes.io/component: app
     {{- with .Values.ingress.labels }}
-    {{ toYaml . | indent 4 }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
   {{- with .Values.ingress.annotations }}
   annotations:
-    {{ toYaml . | indent 4 }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
   {{- with .Values.ingress.className }}
@@ -40,6 +40,6 @@ spec:
               {{- end }}
   {{- with .Values.ingress.tls }}
   tls:
-    {{ toYaml . | indent 4 }}
+    {{- toYaml . | nindent 4 }}
   {{- end }}
 {{- end }}
diff --git a/charts/monica/templates/persistent-volume.yaml b/charts/monica/templates/persistent-volume.yaml
@@ -10,7 +10,7 @@ metadata:
   annotations:
     helm.sh/resource-policy: keep
     {{- with .Values.persistence.annotations }}
-    {{ toYaml . | indent 4 }}
+    {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   accessModes:

diff --git a/charts/monica/templates/queue.yaml b/charts/monica/templates/queue.yaml
@@ -57,7 +57,7 @@ spec:
             {{- end }}
           {{- end }}
           env:
-            {{- include "monica.env" . | indent 12 }}
+            {{- include "monica.env" . | nindent 12 }}
           resources:
             {{- toYaml .Values.monica.queue.resources | nindent 12 }}
           volumeMounts:

diff --git a/charts/monica/values.schema.json b/charts/monica/values.schema.json
@@ -124,6 +124,9 @@
         },
         "pathType": {
           "type": "string"
+        },
+        "tls": {
+          "type": "array"
         }
       },
       "type": "object"
@@ -239,6 +242,12 @@
             "enabled": {
               "type": "boolean"
             },
+            "existingSecret": {
+              "type": "string"
+            },
+            "existingSecretPasswordKey": {
+              "type": "string"
+            },
             "password": {
               "type": "string"
             },
@@ -547,6 +556,12 @@
             "enabled": {
               "type": "boolean"
             },
+            "existingSecret": {
+              "type": "string"
+            },
+            "existingSecretPasswordKey": {
+              "type": "string"
+            },
             "password": {
               "type": "string"
             }
@@ -555,6 +570,40 @@
         },
         "enabled": {
           "type": "boolean"
+        },
+        "global": {
+          "properties": {
+            "storageClass": {
+              "type": "string"
+            }
+          },
+          "type": "object"
+        },
+        "master": {
+          "properties": {
+            "persistence": {
+              "properties": {
+                "enabled": {
+                  "type": "boolean"
+                }
+              },
+              "type": "object"
+            }
+          },
+          "type": "object"
+        },
+        "replica": {
+          "properties": {
+            "persistence": {
+              "properties": {
+                "enabled": {
+                  "type": "boolean"
+                }
+              },
+              "type": "object"
+            }
+          },
+          "type": "object"
         }
       },
       "type": "object"

diff --git a/charts/monica/values.yaml b/charts/monica/values.yaml
@@ -35,32 +35,33 @@ ingress:
   enabled: false
   # -- Name of the ingress class to use
   className: ""
-  # -- An array of service annotations
+  # -- Ingress service annotations
   annotations: {}
-  #  nginx.ingress.kubernetes.io/proxy-body-size: 4G
-  #  kubernetes.io/tls-acme: "true"
-  #  cert-manager.io/cluster-issuer: letsencrypt-prod
-  #  nginx.ingress.kubernetes.io/server-snippet: |-
-  #    server_tokens off;
-  #    proxy_hide_header X-Powered-By;
-  #    location = /.well-known/carddav {
-  #      return 301 $scheme://$host/dav;
-  #    }
-  #    location = /.well-known/caldav {
-  #      return 301 $scheme://$host/dav;
-  #    }
-  #    location = /.well-known/security.txt {
-  #      return 301 $scheme://$host/security.txt;
-  #    }
-  #    location = /robots.txt {
-  #      allow all;
-  #      log_not_found off;
-  #      access_log off;
-  #    }
-  #  tls:
-  #    - secretName: monica-tls
-  #      hosts:
-  #        - monica.kube.home
+    # nginx.ingress.kubernetes.io/proxy-body-size: 4G
+    # kubernetes.io/tls-acme: "true"
+    # cert-manager.io/cluster-issuer: letsencrypt-prod
+    # nginx.ingress.kubernetes.io/server-snippet: |-
+    #   server_tokens off;
+    #   proxy_hide_header X-Powered-By;
+    #   location = /.well-known/carddav {
+    #     return 301 $scheme://$host/dav;
+    #   }
+    #   location = /.well-known/caldav {
+    #     return 301 $scheme://$host/dav;
+    #   }
+    #   location = /.well-known/security.txt {
+    #     return 301 $scheme://$host/security.txt;
+    #   }
+    #   location = /robots.txt {
+    #     allow all;
+    #     log_not_found off;
+    #     access_log off;
+    #   }
+  # -- Ingress TLS configuration
+  tls: []
+    # - secretName: monica-tls
+    #   hosts:
+    #     - monica.kube.home
   # -- An array of service labels
   labels: {}
   # -- The Path to use in Ingress' paths
@@ -320,8 +321,21 @@ redis:
     enabled: true
     # -- Redis password
     password: secret
-    # existingSecret:
-    # existingSecretPasswordKey:
+    # -- Name of an existing secret with Redis credentials (instead of auth.password), must be created ahead of time
+    existingSecret: ""
+    # -- Password key to be retrieved from existing secret
+    existingSecretPasswordKey: ""
+  global:
+    # -- Storage class of backing PVC for Redis
+    storageClass: ""
+  # @ignored
+  master:
+    persistence:
+      enabled: true
+  # @ignored
+  replica:
+    persistence:
+      enabled: true
 
 ##
 ## Memcached chart configuration
@@ -337,8 +351,10 @@ memcached:
     username: monica
     # -- Memcached password
     password: secret
-    # existingSecret:
-    # existingSecretPasswordKey:
+    # -- Name of an existing secret with Memcached credentials (instead of auth.password), must be created ahead of time
+    existingSecret: ""
+    # -- Password key to be retrieved from existing secret
+    existingSecretPasswordKey: ""
   containerSecurityContext:
     # @ignored
     readOnlyRootFilesystem: false