Feature - Add external valkey to nextcloud and juicefs

demo/juicefs/app_of_apps/juicefs_argocd_appset.yaml

@@ -17,9 +17,9 @@ spec:
         input:
           parameters:
             secret_vars:
-              - juicefs_redis_password
-              - juicefs_redis_url
-              - juicefs_redis_port
+              - juicefs_valkey_password
+              - juicefs_valkey_url
+              - juicefs_valkey_port
               - juicefs_s3_key_id
               - juicefs_s3_secret_key
               - juicefs_s3_bucket_url
@@ -78,15 +78,15 @@ spec:
                   - secretName: juicefs-tls
                     hosts:
                       - "{{ .juicefs_s3_dshboard_url }}"
-    
+
             storageClasses:
-            - name: "juicefs-sc"
+            - name: "juicefs"
               enabled: true
               reclaimPolicy: Delete
               allowVolumeExpansion: true
               backend:
                 name: "juicefs"
-                metaurl: "redis://:{{ .juicefs_redis_password }}@{{ .juicefs_redis_url }}:{{ .juicefs_redis_port }}/1"
+                metaurl: "redis://:{{ .juicefs_valkey_password }}@{{ .juicefs_valkey_url }}:{{ .juicefs_valkey_port }}/1"
                 storage: "s3"
                 bucket: "{{ .juicefs_s3_bucket_url }}"
                 accessKey: {{ .juicefs_s3_key_id }}

demo/juicefs/app_of_apps/valkey-cluster_argocd_app.yaml

@@ -0,0 +1,116 @@
+---
+# has to be after secrets, but before web-app
+apiVersion: argoproj.io/v1alpha1
+kind: ApplicationSet
+metadata:
+  name: juicefs-valkey-cluster-appset
+  namespace: argocd
+  annotations:
+    argocd.argoproj.io/sync-wave: "3"
+spec:
+  goTemplate: true
+  # generator allows us to source specific values from an external k8s secret
+  generators:
+    - plugin:
+        configMapRef:
+          name: secret-var-plugin-generator
+        input:
+          parameters:
+            secret_vars:
+              - juicefs_valkey_password
+  template:
+    metadata:
+      name: juicefs-valkey-cluster
+      annotations:
+        argocd.argoproj.io/sync-wave: "1"
+    spec:
+      project: juicefs
+      destination:
+        server: https://kubernetes.default.svc
+        namespace: juicefs
+      syncPolicy:
+        syncOptions:
+          - CreateNamespace=true
+          - ApplyOutOfSyncOnly=true
+        automated:
+          prune: true
+          selfHeal: true
+      source:
+        repoURL: 'registry-1.docker.io'
+        chart: bitnamicharts/valkey-cluster
+        targetRevision: 0.1.2
+        helm:
+          values: |
+            fullnameOverride: "valkey"
+
+            usePassword: false
+            password: ""
+            existingSecret: ""
+            existingSecretPasswordKey: ""
+
+            tls:
+              enabled: true
+              authClients: true
+              autoGenerated: true
+
+            service:
+              ports:
+                valkey: 6379
+              type: ClusterIP
+              loadBalancerIP: ""
+              loadBalancerSourceRanges: []
+              externalTrafficPolicy: Cluster
+
+            persistence:
+              enabled: true
+              path: /bitnami/valkey/data
+              storageClass: "local-path"
+              annotations:
+                k8up.io/backup: "true"
+              accessModes:
+                - ReadWriteOnce
+              size: 8Gi
+
+            persistentVolumeClaimRetentionPolicy:
+              enabled: false
+              whenScaled: Retain
+              whenDeleted: Retain
+
+            valkey:
+              command: []
+              args: []
+              updateStrategy:
+                type: RollingUpdate
+                rollingUpdate:
+                  partition: 0
+              podManagementPolicy: Parallel
+              automountServiceAccountToken: false
+              hostNetwork: false
+              useAOFPersistence: "yes"
+              containerPorts:
+                valkey: 6379
+                bus: 16379
+              resourcesPreset: "small"
+              resources: {}
+
+            cluster:
+              init: true
+              nodes: 6
+              replicas: 1
+              externalAccess:
+                enabled: false
+                hostMode: false
+                service:
+                  disableLoadBalancerIP: false
+                  type: LoadBalancer
+                  port: 6379
+                  loadBalancerIP: []
+                  loadBalancerSourceRanges: []
+
+            metrics:
+              enabled: false
+              resourcesPreset: "micro"
+              serviceMonitor:
+                enabled: false
+
+

nextcloud/app_of_apps/nextcloud_argocd_appset.yaml

@@ -187,11 +187,26 @@ spec:
                 - name: "PGSSLROOTCERT"
                   value: /etc/secrets/ca/ca.crt
 
+                - name: "REDIS_HOST"
+                  value: valkey-primary.nextcloud.svc.cluster.local
+
+                - name: "REDIS_HOST_PORT"
+                  value: "6379"
+
+                - name: "REDIS_HOST_PASSWORD"
+                  valueFrom:
+                    secretKeyRef:
+                      name: nextcloud-redis-credentials
+                      key: redis_password
+
               extraVolumes:
                 # - name: before-starting-scripts
                 #   configMap:
                 #     name: before-starting-scripts
                 #     defaultMode: 0550
+                #- name: certs
+                #  secret:
+                #    secretName: valkey-crt
 
                 - name: postgres-ca
                   secret:
@@ -206,21 +221,28 @@ spec:
               extraVolumeMounts:
                 # - name: before-starting-scripts
                 #   mountPath: /docker-entrypoint-hooks.d/before-starting
+                #- mountPath: /certs
+                #  name: certs
 
                 - name: postgres-ca
                   mountPath: /etc/secrets/ca
 
                 - name: postgres-client-certs
                   mountPath: /etc/secrets/nextcloud
 
-              # defaultConfigs:
-              #   redis.config.php: false
+              defaultConfigs:
+                redis.config.php: true
 
               phpConfigs:
                 #  www.conf: |-
                 #    [www]
                 #    user = www-data
                 #    group = www-data
+                #redis-cluster.ini: |-
+                #  redis.session.locking_enabled=1
+                #  redis.session.lock_retries=-1
+                #  redis.session.lock_wait_time=10000
+
                 www.conf: |-
                   [www]
                   security.limit_extensions = .php .css .js .html
@@ -243,6 +265,19 @@ spec:
                   php_admin_value[post_max_size] = 10G
 
               configs:
+                redis.config.php: |-
+                  <?php
+                  $CONFIG = [
+                    'memcache.local' => '\OC\Memcache\Redis',
+                    'memcache.distributed' => '\\OC\\Memcache\\Redis',
+                    'memcache.locking' => '\\OC\\Memcache\\Redis',
+                    'redis' => [
+                      'host' => 'getenv("REDIS_HOST")',
+                      'port' => 'getenv("REDIS_HOST_PORT")',
+                      'password' => 'getenv(REDIS_HOST_PASSWORD)',
+                    ],
+                  ];
+
                 logging.config.php: |-
                   <?php
                   $CONFIG = array (

nextcloud/app_of_apps/pvc_argocd_appset.yaml

@@ -23,6 +23,9 @@ spec:
               - nextcloud_config_pvc_enabled
               - nextcloud_config_storage
               - nextcloud_config_access_mode
+              - nextcloud_valkey_storage
+              - nextcloud_valkey_access_mode
+              - nextcloud_valkey_pvc_enabled
   template:
     metadata:
       name: nextcloud-pvc
@@ -42,19 +45,38 @@ spec:
       source:
         repoURL: https://github.com/small-hack/argocd-apps.git
         path: nextcloud/storage/pvc/
-        targetRevision: main
+        targetRevision: valkey-nextcloud
         helm:
           valuesObject:
             # -- enable nextcloud files pvc
             files_pvc:
-              enabled: '{{ .nextcloud_files_pvc_enabled }}'
-              storageClassName: '{{ .global_pvc_storage_class }}'
-              accessMode: '{{ .nextcloud_files_access_mode }}'
-              storage: '{{ .nextcloud_files_storage }}'
+              enabled: true
+              #enabled: '{{ .nextcloud_valkey_pvc_enabled }}'
+              storageClassName: local-path
+              #storageClassName: '{{ .global_pvc_storage_class }}'
+              accessMode: ReadWriteOnce
+              #accessMode: '{{ .nextcloud_valkey_access_mode }}'
+              storage: 20Gi
+              #storage: '{{ .nextcloud_valkey_storage }}'
 
             # -- enable nextcloud configuration pvc
             config_pvc:
-              enabled: '{{ .nextcloud_config_pvc_enabled }}'
-              storageClassName: '{{ .global_pvc_storage_class }}'
-              accessMode: '{{ .nextcloud_config_access_mode }}'
-              storage: '{{ .nextcloud_config_storage }}'
+              enabled: true
+              #enabled: '{{ .nextcloud_valkey_pvc_enabled }}'
+              storageClassName: local-path
+              #storageClassName: '{{ .global_pvc_storage_class }}'
+              accessMode: ReadWriteOnce
+              #accessMode: '{{ .nextcloud_valkey_access_mode }}'
+              storage: 2Gi
+              #storage: '{{ .nextcloud_valkey_storage }}'
+
+            # -- enable mastodon valkeyuration pvc
+            valkey_pvc:
+              enabled: true
+              #enabled: '{{ .nextcloud_valkey_pvc_enabled }}'
+              storageClassName: local-path
+              #storageClassName: '{{ .global_pvc_storage_class }}'
+              accessMode: ReadWriteOnce
+              #accessMode: '{{ .nextcloud_valkey_access_mode }}'
+              storage: 2Gi
+              #storage: '{{ .nextcloud_valkey_storage }}'