From 7f9f57b8f746f0ead5ccef66316c3a6e7c6af666 Mon Sep 17 00:00:00 2001 From: gitea-bot Date: Tue, 24 Mar 2026 19:04:53 +0000 Subject: [PATCH] chore: Update manifests after change --- .../komodo/Deployment-komodo-main.yaml | 7 ++- ...et-komodo-keys-backup-secret-external.yaml | 58 +++++++++++++++++++ ...ecret-komodo-keys-backup-secret-local.yaml | 58 +++++++++++++++++++ ...cret-komodo-keys-backup-secret-remote.yaml | 58 +++++++++++++++++++ .../PersistentVolumeClaim-komodo-keys.yaml | 19 ++++++ ...ce-komodo-keys-backup-source-external.yaml | 29 ++++++++++ ...ource-komodo-keys-backup-source-local.yaml | 29 ++++++++++ ...urce-komodo-keys-backup-source-remote.yaml | 29 ++++++++++ 8 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-keys-backup-secret-external.yaml create mode 100644 clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-keys-backup-secret-local.yaml create mode 100644 clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-keys-backup-secret-remote.yaml create mode 100644 clusters/cl01tl/manifests/komodo/PersistentVolumeClaim-komodo-keys.yaml create mode 100644 clusters/cl01tl/manifests/komodo/ReplicationSource-komodo-keys-backup-source-external.yaml create mode 100644 clusters/cl01tl/manifests/komodo/ReplicationSource-komodo-keys-backup-source-local.yaml create mode 100644 clusters/cl01tl/manifests/komodo/ReplicationSource-komodo-keys-backup-source-remote.yaml diff --git a/clusters/cl01tl/manifests/komodo/Deployment-komodo-main.yaml b/clusters/cl01tl/manifests/komodo/Deployment-komodo-main.yaml index b190f2423..562460202 100644 --- a/clusters/cl01tl/manifests/komodo/Deployment-komodo-main.yaml +++ b/clusters/cl01tl/manifests/komodo/Deployment-komodo-main.yaml @@ -102,7 +102,7 @@ spec: name: komodo-secret - name: KOMODO_OIDC_USE_FULL_EMAIL value: "true" - image: ghcr.io/moghtech/komodo-core:1.19.5 + image: ghcr.io/moghtech/komodo-core:2.0.0@sha256:3cc134272b39313ae1fb34ea8a3c8a0c2f629a3c2eeaf71258702159f154f9e9 imagePullPolicy: IfNotPresent name: main resources: @@ -112,12 +112,17 @@ spec: volumeMounts: - mountPath: /repo-cache name: cache + - mountPath: /config/keys + name: keys - mountPath: /syncs name: syncs volumes: - name: cache persistentVolumeClaim: claimName: komodo-cache + - name: keys + persistentVolumeClaim: + claimName: komodo-keys - name: syncs persistentVolumeClaim: claimName: komodo-syncs diff --git a/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-keys-backup-secret-external.yaml b/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-keys-backup-secret-external.yaml new file mode 100644 index 000000000..f8ed8357f --- /dev/null +++ b/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-keys-backup-secret-external.yaml @@ -0,0 +1,58 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: komodo-keys-backup-secret-external + namespace: komodo + labels: + helm.sh/chart: volsync-target-keys-0.8.0 + app.kubernetes.io/instance: komodo + app.kubernetes.io/part-of: komodo + app.kubernetes.io/version: "0.8.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: komodo-keys-backup-secret-external +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + target: + template: + mergePolicy: Merge + engineVersion: v2 + data: + RESTIC_REPOSITORY: "{{ .BUCKET_ENDPOINT }}/komodo/komodo-keys" + data: + - secretKey: BUCKET_ENDPOINT + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /volsync/restic/digital-ocean + metadataPolicy: None + property: BUCKET_ENDPOINT + - secretKey: RESTIC_PASSWORD + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /volsync/restic/digital-ocean + metadataPolicy: None + property: RESTIC_PASSWORD + - secretKey: AWS_DEFAULT_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /digital-ocean/home-infra/volsync-backups + metadataPolicy: None + property: AWS_DEFAULT_REGION + - secretKey: AWS_ACCESS_KEY_ID + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /digital-ocean/home-infra/volsync-backups + metadataPolicy: None + property: AWS_ACCESS_KEY_ID + - secretKey: AWS_SECRET_ACCESS_KEY + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /digital-ocean/home-infra/volsync-backups + metadataPolicy: None + property: AWS_SECRET_ACCESS_KEY diff --git a/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-keys-backup-secret-local.yaml b/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-keys-backup-secret-local.yaml new file mode 100644 index 000000000..da0603a9d --- /dev/null +++ b/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-keys-backup-secret-local.yaml @@ -0,0 +1,58 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: komodo-keys-backup-secret-local + namespace: komodo + labels: + helm.sh/chart: volsync-target-keys-0.8.0 + app.kubernetes.io/instance: komodo + app.kubernetes.io/part-of: komodo + app.kubernetes.io/version: "0.8.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: komodo-keys-backup-secret-local +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + target: + template: + mergePolicy: Merge + engineVersion: v2 + data: + RESTIC_REPOSITORY: "{{ .BUCKET_ENDPOINT }}/komodo/komodo-keys" + data: + - secretKey: BUCKET_ENDPOINT + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /volsync/restic/garage-local + metadataPolicy: None + property: BUCKET_ENDPOINT + - secretKey: RESTIC_PASSWORD + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /volsync/restic/garage-local + metadataPolicy: None + property: RESTIC_PASSWORD + - secretKey: AWS_DEFAULT_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/volsync-backups + metadataPolicy: None + property: ACCESS_REGION + - secretKey: AWS_ACCESS_KEY_ID + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/volsync-backups + metadataPolicy: None + property: ACCESS_KEY_ID + - secretKey: AWS_SECRET_ACCESS_KEY + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/volsync-backups + metadataPolicy: None + property: ACCESS_SECRET_KEY diff --git a/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-keys-backup-secret-remote.yaml b/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-keys-backup-secret-remote.yaml new file mode 100644 index 000000000..ad31c10c2 --- /dev/null +++ b/clusters/cl01tl/manifests/komodo/ExternalSecret-komodo-keys-backup-secret-remote.yaml @@ -0,0 +1,58 @@ +apiVersion: external-secrets.io/v1 +kind: ExternalSecret +metadata: + name: komodo-keys-backup-secret-remote + namespace: komodo + labels: + helm.sh/chart: volsync-target-keys-0.8.0 + app.kubernetes.io/instance: komodo + app.kubernetes.io/part-of: komodo + app.kubernetes.io/version: "0.8.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: komodo-keys-backup-secret-remote +spec: + secretStoreRef: + kind: ClusterSecretStore + name: vault + target: + template: + mergePolicy: Merge + engineVersion: v2 + data: + RESTIC_REPOSITORY: "{{ .BUCKET_ENDPOINT }}/komodo/komodo-keys" + data: + - secretKey: BUCKET_ENDPOINT + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /volsync/restic/garage-remote + metadataPolicy: None + property: BUCKET_ENDPOINT + - secretKey: RESTIC_PASSWORD + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /volsync/restic/garage-remote + metadataPolicy: None + property: RESTIC_PASSWORD + - secretKey: AWS_DEFAULT_REGION + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/volsync-backups + metadataPolicy: None + property: ACCESS_REGION + - secretKey: AWS_ACCESS_KEY_ID + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/volsync-backups + metadataPolicy: None + property: ACCESS_KEY_ID + - secretKey: AWS_SECRET_ACCESS_KEY + remoteRef: + conversionStrategy: Default + decodingStrategy: None + key: /garage/home-infra/volsync-backups + metadataPolicy: None + property: ACCESS_SECRET_KEY diff --git a/clusters/cl01tl/manifests/komodo/PersistentVolumeClaim-komodo-keys.yaml b/clusters/cl01tl/manifests/komodo/PersistentVolumeClaim-komodo-keys.yaml new file mode 100644 index 000000000..d44072beb --- /dev/null +++ b/clusters/cl01tl/manifests/komodo/PersistentVolumeClaim-komodo-keys.yaml @@ -0,0 +1,19 @@ +kind: PersistentVolumeClaim +apiVersion: v1 +metadata: + name: komodo-keys + labels: + app.kubernetes.io/instance: komodo + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: komodo + helm.sh/chart: komodo-4.6.2 + annotations: + helm.sh/resource-policy: keep + namespace: komodo +spec: + accessModes: + - "ReadWriteOnce" + resources: + requests: + storage: "1Gi" + storageClassName: "ceph-block" diff --git a/clusters/cl01tl/manifests/komodo/ReplicationSource-komodo-keys-backup-source-external.yaml b/clusters/cl01tl/manifests/komodo/ReplicationSource-komodo-keys-backup-source-external.yaml new file mode 100644 index 000000000..7fed77200 --- /dev/null +++ b/clusters/cl01tl/manifests/komodo/ReplicationSource-komodo-keys-backup-source-external.yaml @@ -0,0 +1,29 @@ +apiVersion: volsync.backube/v1alpha1 +kind: ReplicationSource +metadata: + name: komodo-keys-backup-source-external + namespace: komodo + labels: + helm.sh/chart: volsync-target-keys-0.8.0 + app.kubernetes.io/instance: komodo + app.kubernetes.io/part-of: komodo + app.kubernetes.io/version: "0.8.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: komodo-keys-backup +spec: + sourcePVC: komodo-keys + trigger: + schedule: 54 13 * * * + restic: + pruneIntervalDays: 7 + repository: komodo-keys-backup-secret-external + retain: + daily: 7 + hourly: 0 + monthly: 3 + weekly: 4 + yearly: 1 + copyMethod: Snapshot + storageClassName: ceph-block + volumeSnapshotClassName: ceph-blockpool-snapshot + cacheCapacity: 1Gi diff --git a/clusters/cl01tl/manifests/komodo/ReplicationSource-komodo-keys-backup-source-local.yaml b/clusters/cl01tl/manifests/komodo/ReplicationSource-komodo-keys-backup-source-local.yaml new file mode 100644 index 000000000..a77a7f02d --- /dev/null +++ b/clusters/cl01tl/manifests/komodo/ReplicationSource-komodo-keys-backup-source-local.yaml @@ -0,0 +1,29 @@ +apiVersion: volsync.backube/v1alpha1 +kind: ReplicationSource +metadata: + name: komodo-keys-backup-source-local + namespace: komodo + labels: + helm.sh/chart: volsync-target-keys-0.8.0 + app.kubernetes.io/instance: komodo + app.kubernetes.io/part-of: komodo + app.kubernetes.io/version: "0.8.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: komodo-keys-backup +spec: + sourcePVC: komodo-keys + trigger: + schedule: 54 11 * * * + restic: + pruneIntervalDays: 7 + repository: komodo-keys-backup-secret-local + retain: + daily: 7 + hourly: 0 + monthly: 3 + weekly: 4 + yearly: 1 + copyMethod: Snapshot + storageClassName: ceph-block + volumeSnapshotClassName: ceph-blockpool-snapshot + cacheCapacity: 1Gi diff --git a/clusters/cl01tl/manifests/komodo/ReplicationSource-komodo-keys-backup-source-remote.yaml b/clusters/cl01tl/manifests/komodo/ReplicationSource-komodo-keys-backup-source-remote.yaml new file mode 100644 index 000000000..64dc9417a --- /dev/null +++ b/clusters/cl01tl/manifests/komodo/ReplicationSource-komodo-keys-backup-source-remote.yaml @@ -0,0 +1,29 @@ +apiVersion: volsync.backube/v1alpha1 +kind: ReplicationSource +metadata: + name: komodo-keys-backup-source-remote + namespace: komodo + labels: + helm.sh/chart: volsync-target-keys-0.8.0 + app.kubernetes.io/instance: komodo + app.kubernetes.io/part-of: komodo + app.kubernetes.io/version: "0.8.0" + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: komodo-keys-backup +spec: + sourcePVC: komodo-keys + trigger: + schedule: 54 12 * * * + restic: + pruneIntervalDays: 7 + repository: komodo-keys-backup-secret-remote + retain: + daily: 7 + hourly: 0 + monthly: 3 + weekly: 4 + yearly: 1 + copyMethod: Snapshot + storageClassName: ceph-block + volumeSnapshotClassName: ceph-blockpool-snapshot + cacheCapacity: 1Gi -- 2.49.1