feat: refactor apps (#5428)

Reviewed-on: #5428
2026-04-03 01:35:03 +00:00
parent 98e796a79f
commit 70bdc0ff8e
10 changed files with 36 additions and 137 deletions
--- a/clusters/cl01tl/helm/komodo/Chart.lock
+++ b/clusters/cl01tl/helm/komodo/Chart.lock
@@ -4,9 +4,9 @@ dependencies:
  version: 4.6.2
 - name: postgres-cluster
  repository: oci://harbor.alexlebens.net/helm-charts
-  version: 7.10.0
+  version: 7.11.1
 - name: volsync-target
  repository: oci://harbor.alexlebens.net/helm-charts
  version: 0.8.0
-digest: sha256:c1bbed66c94b64ba44ef1caadf74d46d9bce551e37b62b1cd0a3af9b81046251
-generated: "2026-03-24T14:00:56.813765-05:00"
+digest: sha256:9af0fa5ab5e1895e94d64ea5983b5ee58c8b4dd9c5c8ef8021c8c7f950fd54c4
+generated: "2026-04-02T20:28:17.818342-05:00"
--- a/clusters/cl01tl/helm/komodo/Chart.yaml
+++ b/clusters/cl01tl/helm/komodo/Chart.yaml
@@ -4,16 +4,16 @@ version: 1.0.0
 description: Komodo
 keywords:
  - komodo
-  - deployment
-  - dashboard
-  - docker-compose
-home: https://wiki.alexlebens.dev/s/bb7eb683-b5c7-4f50-9f2c-e8e57dc67c81
+  - docker-deployment
+home: https://docs.alexlebens.dev/applications/komodo/
 sources:
  - https://github.com/moghtech/komodo
-  - https://github.com/cloudnative-pg/cloudnative-pg
+  - https://github.com/FerretDB/FerretDB
  - https://github.com/moghtech/komodo/pkgs/container/komodo-core
+  - https://github.com/ferretdb/FerretDB/pkgs/container/ferretdb
  - https://github.com/bjw-s-labs/helm-charts/tree/main/charts/other/app-template
  - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/postgres-cluster
+  - https://gitea.alexlebens.dev/alexlebens/helm-charts/src/branch/main/charts/volsync-target
 maintainers:
  - name: alexlebens
 dependencies:
@@ -23,7 +23,7 @@ dependencies:
    version: 4.6.2
  - name: postgres-cluster
    alias: postgresql-17-fdb-cluster
-    version: 7.10.0
+    version: 7.11.1
    repository: oci://harbor.alexlebens.net/helm-charts
  - name: volsync-target
    alias: volsync-target-keys
--- a/clusters/cl01tl/helm/komodo/templates/external-secret.yaml
+++ b/clusters/cl01tl/helm/komodo/templates/external-secret.yaml
@@ -14,38 +14,23 @@ spec:
  data:
    - secretKey: passkey
      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
        key: /cl01tl/komodo/config
-        metadataPolicy: None
        property: passkey
    - secretKey: jwt
      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
        key: /cl01tl/komodo/config
-        metadataPolicy: None
        property: jwt
    - secretKey: webhook
      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
        key: /cl01tl/komodo/config
-        metadataPolicy: None
        property: webhook
    - secretKey: oidc-client-id
      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
        key: /authentik/oidc/komodo
-        metadataPolicy: None
        property: client
    - secretKey: oidc-client-secret
      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
        key: /authentik/oidc/komodo
-        metadataPolicy: None
        property: secret

 ---
@@ -65,15 +50,9 @@ spec:
  data:
    - secretKey: uri
      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
        key: /cl01tl/komodo/ferret
-        metadataPolicy: None
        property: uri
    - secretKey: password
      remoteRef:
-        conversionStrategy: Default
-        decodingStrategy: None
        key: /cl01tl/komodo/ferret
-        metadataPolicy: None
        property: password
--- a/clusters/cl01tl/helm/komodo/values.yaml
+++ b/clusters/cl01tl/helm/komodo/values.yaml
@@ -10,7 +10,6 @@ komodo:
          image:
            repository: ghcr.io/moghtech/komodo-core
            tag: 2.1.1@sha256:2bbbb1efd3534211dac35091e0818f10398d9bdd98fdbf0ddef09e9e0b5ec4ba
-            pullPolicy: IfNotPresent
          env:
            - name: COMPOSE_LOGGING_DRIVER
              value: local
@@ -45,7 +44,7 @@ komodo:
            - name: KOMODO_LOCAL_AUTH
              value: true
            - name: KOMODO_ENABLE_NEW_USERS
-              value: true
+              value: false
            - name: KOMODO_DISABLE_NON_ADMIN_CREATE
              value: true
            - name: KOMODO_TRANSPARENT_MODE
@@ -82,18 +81,16 @@ komodo:
          resources:
            requests:
              cpu: 10m
-              memory: 128Mi
+              memory: 80Mi
    ferretdb-2:
      type: deployment
      replicas: 1
      strategy: Recreate
-      revisionHistoryLimit: 3
      containers:
        main:
          image:
            repository: ghcr.io/ferretdb/ferretdb
-            tag: 2.7.0
-            pullPolicy: IfNotPresent
+            tag: 2.7.0@sha256:5706414241eb84f0515512c37b46db0f1b1eac9e5ceb7e4c2523211c184b1985
          env:
            - name: DB_USERNAME
              value: ferret
@@ -106,8 +103,8 @@ komodo:
              value: postgresql://$(DB_USERNAME):$(DB_PASSWORD)@komodo-postgresql-17-fdb-cluster-rw.komodo.svc.cluster.local:5432/ferretDB
          resources:
            requests:
-              cpu: 10m
-              memory: 128Mi
+              cpu: 1m
+              memory: 20Mi
  service:
    main:
      controller: main
@@ -115,14 +112,12 @@ komodo:
        http:
          port: 80
          targetPort: 9120
-          protocol: HTTP
    ferretdb-2:
      controller: ferretdb-2
      ports:
        http:
          port: 27017
          targetPort: 27017
-          protocol: HTTP
  route:
    main:
      kind: HTTPRoute
@@ -135,11 +130,8 @@ komodo:
        - komodo.alexlebens.net
      rules:
        - backendRefs:
-            - group: ''
-              kind: Service
-              name: komodo-main
+            - name: komodo-main
              port: 80
-              weight: 100
          matches:
            - path:
                type: PathPrefix
@@ -150,7 +142,6 @@ komodo:
      storageClass: ceph-block
      accessMode: ReadWriteOnce
      size: 1Gi
-      retain: true
      advancedMounts:
        main:
          main:
@@ -160,7 +151,6 @@ komodo:
      storageClass: ceph-block
      accessMode: ReadWriteOnce
      size: 5Gi
-      retain: true
      advancedMounts:
        main:
          main:
@@ -170,7 +160,6 @@ komodo:
      storageClass: ceph-block
      accessMode: ReadWriteOnce
      size: 5Gi
-      retain: true
      advancedMounts:
        main:
          main:
@@ -182,7 +171,7 @@ postgresql-17-fdb-cluster:
  cluster:
    image:
      repository: ghcr.io/ferretdb/postgres-documentdb
-      tag: "17-0.106.0-ferretdb-2.5.0"
+      tag: 17-0.107.0-ferretdb-2.7.0@sha256:2386795ec2aa7ae559304361979f1dc5708d383ee9020ae63dadc2940dfe58f7
    postgresUID: 999
    postgresGID: 999
    postgresql:
@@ -224,35 +213,12 @@ postgresql-17-fdb-cluster:
        destinationBucket: postgres-backups
        externalSecretCredentialPath: /garage/home-infra/postgres-backups
        isWALArchiver: true
-      # - name: garage-remote
-      #   index: 1
-      #   destinationBucket: postgres-backups
-      #   externalSecretCredentialPath: /garage/home-infra/postgres-backups
-      #   retentionPolicy: "90d"
-      #   data:
-      #     compression: bzip2
-      # - name: external
-      #   index: 1
-      #   endpointURL: https://nyc3.digitaloceanspaces.com
-      #   destinationBucket: postgres-backups-ce540ddf106d186bbddca68a
-      #   externalSecretCredentialPath: /garage/home-infra/postgres-backups
-      #   isWALArchiver: false
    scheduledBackups:
      - name: live-backup
        suspend: false
        immediate: true
        schedule: "0 50 14 * * *"
        backupName: garage-local
-      # - name: weekly-backup
-      #   suspend: true
-      #   immediate: true
-      #   schedule: "0 0 4 * * SAT"
-      #   backupName: garage-remote
-      # - name: daily-backup
-      #   suspend: true
-      #   immediate: true
-      #   schedule: "0 0 0 * * *"
-      #   backupName: external
 volsync-target-keys:
  pvcTarget: komodo-keys
  local: