From 8562fa0cb4e4f9384f37e9a0fefc832a28f170cb Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Fri, 3 Oct 2025 17:49:45 -0500 Subject: [PATCH] remove v1 ferret --- clusters/cl01tl/management/komodo/Chart.yaml | 4 - .../komodo/templates/external-secret.yaml | 30 ------ clusters/cl01tl/management/komodo/values.yaml | 97 ------------------- 3 files changed, 131 deletions(-) diff --git a/clusters/cl01tl/management/komodo/Chart.yaml b/clusters/cl01tl/management/komodo/Chart.yaml index 2f558ffa6..9ef40f6ee 100644 --- a/clusters/cl01tl/management/komodo/Chart.yaml +++ b/clusters/cl01tl/management/komodo/Chart.yaml @@ -21,10 +21,6 @@ dependencies: alias: komodo repository: https://bjw-s-labs.github.io/helm-charts/ version: 4.3.0 - - name: postgres-cluster - alias: postgres-17-cluster - version: 6.9.1 - repository: oci://harbor.alexlebens.net/helm-charts - name: postgres-cluster alias: postgresql-17-fdb-cluster version: 6.9.1 diff --git a/clusters/cl01tl/management/komodo/templates/external-secret.yaml b/clusters/cl01tl/management/komodo/templates/external-secret.yaml index beb0f4a84..52c2d3139 100644 --- a/clusters/cl01tl/management/komodo/templates/external-secret.yaml +++ b/clusters/cl01tl/management/komodo/templates/external-secret.yaml @@ -48,36 +48,6 @@ spec: metadataPolicy: None property: secret ---- -apiVersion: external-secrets.io/v1 -kind: ExternalSecret -metadata: - name: komodo-postgresql-17-cluster-backup-secret - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: komodo-postgresql-17-cluster-backup-secret - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - secretStoreRef: - kind: ClusterSecretStore - name: vault - data: - - secretKey: ACCESS_KEY_ID - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /digital-ocean/home-infra/postgres-backups - metadataPolicy: None - property: access - - secretKey: ACCESS_SECRET_KEY - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /digital-ocean/home-infra/postgres-backups - metadataPolicy: None - property: secret - --- apiVersion: external-secrets.io/v1 kind: ExternalSecret diff --git a/clusters/cl01tl/management/komodo/values.yaml b/clusters/cl01tl/management/komodo/values.yaml index 631d61f22..9fdba352e 100644 --- a/clusters/cl01tl/management/komodo/values.yaml +++ b/clusters/cl01tl/management/komodo/values.yaml @@ -86,27 +86,6 @@ komodo: requests: cpu: 10m memory: 128Mi - ferretdb: - type: deployment - replicas: 0 - strategy: Recreate - revisionHistoryLimit: 3 - containers: - main: - image: - repository: ghcr.io/ferretdb/ferretdb - tag: 1.24.2 - pullPolicy: IfNotPresent - env: - - name: FERRETDB_POSTGRESQL_URL - valueFrom: - secretKeyRef: - name: komodo-postgresql-17-cluster-app - key: uri - resources: - requests: - cpu: 10m - memory: 128Mi ferretdb-2: type: deployment replicas: 1 @@ -128,48 +107,6 @@ komodo: requests: cpu: 10m memory: 128Mi - copy: - type: deployment - replicas: 0 - strategy: Recreate - revisionHistoryLimit: 3 - containers: - main: - image: - repository: ghcr.io/moghtech/komodo-cli - tag: latest - pullPolicy: IfNotPresent - command: ["km"] - args: ["database", "copy", "-y"] - env: - - name: DB_USERNAME - valueFrom: - secretKeyRef: - name: komodo-postgresql-17-cluster-app - key: username - - name: DB_PASSWORD - valueFrom: - secretKeyRef: - name: komodo-postgresql-17-cluster-app - key: password - - name: KOMODO_DATABASE_URI - value: mongodb://$(DB_USERNAME):$(DB_PASSWORD)@komodo-ferretdb.komodo:27017/komodo?authMechanism=PLAIN - - name: KOMODO_DATABASE_DB_NAME - value: komodo - - name: TARGET_DB_USERNAME - valueFrom: - secretKeyRef: - name: komodo-postgresql-17-fdb-cluster-app - key: username - - name: TARGET_DB_PASSWORD - valueFrom: - secretKeyRef: - name: komodo-postgresql-17-fdb-cluster-app - key: password - - name: KOMODO_CLI_DATABASE_TARGET_URI - value: mongodb://$(TARGET_DB_USERNAME):$(TARGET_DB_PASSWORD)@komodo-ferretdb-2.komodo:27017/ferretDB - - name: KOMODO_CLI_DATABASE_TARGET_DB_NAME - value: komodo service: main: controller: main @@ -178,13 +115,6 @@ komodo: port: 80 targetPort: 9120 protocol: HTTP - ferretdb: - controller: ferretdb - ports: - http: - port: 27017 - targetPort: 27017 - protocol: HTTP ferretdb-2: controller: ferretdb-2 ports: @@ -213,33 +143,6 @@ komodo: main: - path: /syncs readOnly: false -postgres-17-cluster: - mode: recovery - cluster: - storage: - storageClass: local-path - walStorage: - storageClass: local-path - monitoring: - enabled: true - prometheusRule: - enabled: true - recovery: - method: objectStore - objectStore: - destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/komodo/komodo-postgresql-17-cluster - index: 2 - backup: - objectStore: - - name: external - destinationPath: s3://postgres-backups-ce540ddf106d186bbddca68a/cl01tl/komodo/komodo-postgresql-17-cluster - index: 2 - retentionPolicy: "3d" - scheduledBackups: - - name: daily-backup - suspend: false - schedule: "0 0 0 * * *" - backupName: external postgresql-17-fdb-cluster: nameOverride: komodo-postgresql-17-fdb mode: standalone