feat(ente): switch to DragonFly cache

ente/config/museum.yaml

@@ -2,76 +2,79 @@
 
 # HTTP connection parameters
 http:
-    # If true, bind to 443 and use TLS.
-    # By default, this is false, and museum will bind to 8080 without TLS.
-    # use-tls: true
+  # If true, bind to 443 and use TLS.
+  # By default, this is false, and museum will bind to 8080 without TLS.
+  # use-tls: true
 
 # Specify the base endpoints for various apps
 apps:
-    # Default is https://albums.ente.io
-    #
-    # If you're running a self hosted instance and wish to serve public links,
-    # set this to the URL where your albums web app is running.
-    public-albums: https://albums.ente.icb4dc0.de
+  # Default is https://albums.ente.io
+  #
+  # If you're running a self hosted instance and wish to serve public links,
+  # set this to the URL where your albums web app is running.
+  public-albums: https://albums.ente.icb4dc0.de
 
+cache:
+  type: redis
+  connectionString: redis://ente-musuem-cache:6379/0
 
 # Various low-level configuration options
 internal:
-    # If false (the default), then museum will notify the external world of
-    # various events. E.g, email users about their storage being full, send
-    # alerts to Discord, etc.
-    #
-    # It can be set to true when running a "read only" instance like a backup
-    # restoration test, where we want to be able to access data but otherwise
-    # minimize external side effects.
-    silent: false
-    # If provided, this external healthcheck url is periodically pinged.
-    health-check-url:
-    # Hardcoded verification codes, useful for logging in when developing.
-    #
-    # Uncomment this and set these to your email ID or domain so that you don't
-    # need to peek into the server logs for obtaining the OTP when trying to log
-    # into an instance you're developing on.
-    # hardcoded-ott:
-    #     emails:
-    #         - "example@example.org,123456"
-    #     # When running in a local environment, hardcode the verification code to
-    #     # 123456 for email addresses ending with @example.org
-    #     local-domain-suffix: "@example.org"
-    #     local-domain-value: 123456
-    # List of user IDs that can use the admin API endpoints.
-    admins:
-        - 1580559962386438
+  # If false (the default), then museum will notify the external world of
+  # various events. E.g, email users about their storage being full, send
+  # alerts to Discord, etc.
+  #
+  # It can be set to true when running a "read only" instance like a backup
+  # restoration test, where we want to be able to access data but otherwise
+  # minimize external side effects.
+  silent: false
+  # If provided, this external healthcheck url is periodically pinged.
+  health-check-url:
+  # Hardcoded verification codes, useful for logging in when developing.
+  #
+  # Uncomment this and set these to your email ID or domain so that you don't
+  # need to peek into the server logs for obtaining the OTP when trying to log
+  # into an instance you're developing on.
+  # hardcoded-ott:
+  #     emails:
+  #         - "example@example.org,123456"
+  #     # When running in a local environment, hardcode the verification code to
+  #     # 123456 for email addresses ending with @example.org
+  #     local-domain-suffix: "@example.org"
+  #     local-domain-value: 123456
+  # List of user IDs that can use the admin API endpoints.
+  admins:
+    - 1580559962386438
 
 # Replication config
 #
 # If enabled, replicate each file to 2 other data centers after it gets
 # successfully uploaded to the primary hot storage.
 replication:
-    enabled: false
-    # The Cloudflare worker to use to download files from the primary hot
-    # bucket. Must be specified if replication is enabled.
-    worker-url:
-    # Number of go routines to spawn for replication
-    # This is not related to the worker-url above.
-    # Optional, default value is indicated here.
-    worker-count: 6
-    # Where to store temporary objects during replication v3
-    # Optional, default value is indicated here.
-    tmp-storage: tmp/replication
+  enabled: false
+  # The Cloudflare worker to use to download files from the primary hot
+  # bucket. Must be specified if replication is enabled.
+  worker-url:
+  # Number of go routines to spawn for replication
+  # This is not related to the worker-url above.
+  # Optional, default value is indicated here.
+  worker-count: 6
+  # Where to store temporary objects during replication v3
+  # Optional, default value is indicated here.
+  tmp-storage: tmp/replication
 
 # Configuration for various background / cron jobs.
 jobs:
-    cron:
-        # Instances run various cleanup, sending emails and other cron jobs. Use
-        # this flag to disable all these cron jobs.
-        skip: false
-    remove-unreported-objects:
-        # Number of go routines to spawn for object cleanup
-        # Optional, default value is indicated here.
-        worker-count: 1
-    clear-orphan-objects:
-        # By default, this job is disabled.
-        enabled: false
-        # If provided, only objects that begin with this prefix are pruned.
-        prefix: ""
+  cron:
+    # Instances run various cleanup, sending emails and other cron jobs. Use
+    # this flag to disable all these cron jobs.
+    skip: false
+  remove-unreported-objects:
+    # Number of go routines to spawn for object cleanup
+    # Optional, default value is indicated here.
+    worker-count: 1
+  clear-orphan-objects:
+    # By default, this job is disabled.
+    enabled: false
+    # If provided, only objects that begin with this prefix are pruned.
+    prefix: ""

ente/resources/museum/deployment.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   name: museum
 spec:
-  replicas: 1
+  replicas: 2
   revisionHistoryLimit: 3
   selector:
     matchLabels:
@@ -16,62 +16,62 @@ spec:
         app.kubernetes.io/part-of: ente
     spec:
       containers:
-      - name: museum
-        image: museum
-        env:
-          - name: ENTE_CREDENTIALS_FILE
-            value: /credentials.yaml
-          - name: ENTE_DB_HOST
-            valueFrom:
-              secretKeyRef:
-                name: ente-db-credentials-ente-ente
-                key: HOST
-          - name: ENTE_DB_NAME
-            valueFrom:
-              secretKeyRef:
-                name: ente-db-credentials-ente-ente
-                key: DATABASE_NAME
-          - name: ENTE_DB_USER
-            valueFrom:
-              secretKeyRef:
-                name: ente-db-credentials-ente-ente
-                key: LOGIN
-          - name: ENTE_DB_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: ente-db-credentials-ente-ente
-                key: PASSWORD
-          - name: ENTE_DB_SSLMODE
-            value: require
-        resources:
-          requests:
-            memory: "64Mi"
-            cpu: "50m"
-          limits:
-            memory: "128Mi"
-            cpu: "250m"
-        ports:
-        - name: api
-          containerPort: 8080
-        - name: metrics
-          containerPort: 2112
-        readinessProbe:
-          httpGet:
-            path: /ping
-            port: 8080
-        livenessProbe:
-          httpGet:
-            path: /ping
-            port: 8080
-        volumeMounts:
-          - name: logs
-            mountPath: /var/log/ente
-          - name: config
-            mountPath: /museum.yaml
-            subPath: museum.yaml
-          - name: credentials
-            mountPath: /credentials.yaml
-            subPath: credentials.yaml
+        - name: museum
+          image: museum
+          env:
+            - name: ENTE_CREDENTIALS_FILE
+              value: /credentials.yaml
+            - name: ENTE_DB_HOST
+              valueFrom:
+                secretKeyRef:
+                  name: ente-db-credentials-ente-ente
+                  key: HOST
+            - name: ENTE_DB_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: ente-db-credentials-ente-ente
+                  key: DATABASE_NAME
+            - name: ENTE_DB_USER
+              valueFrom:
+                secretKeyRef:
+                  name: ente-db-credentials-ente-ente
+                  key: LOGIN
+            - name: ENTE_DB_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: ente-db-credentials-ente-ente
+                  key: PASSWORD
+            - name: ENTE_DB_SSLMODE
+              value: require
+          resources:
+            requests:
+              memory: "64Mi"
+              cpu: "50m"
+            limits:
+              memory: "128Mi"
+              cpu: "250m"
+          ports:
+            - name: api
+              containerPort: 8080
+            - name: metrics
+              containerPort: 2112
+          readinessProbe:
+            httpGet:
+              path: /ping
+              port: 8080
+          livenessProbe:
+            httpGet:
+              path: /ping
+              port: 8080
+          volumeMounts:
+            - name: logs
+              mountPath: /var/log/ente
+            - name: config
+              mountPath: /museum.yaml
+              subPath: museum.yaml
+            - name: credentials
+              mountPath: /credentials.yaml
+              subPath: credentials.yaml
       volumes:
         - name: logs
           emptyDir: {}