From 23c26e8cc2b9f6179d3fff123e55d5b8e0d42d3c Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Thu, 30 Jul 2026 21:08:25 +1000 Subject: [PATCH] cephrgw v0.4.0; move CNPG backup buckets to ec placement (#312) cephrgw-operator v0.4.0 adds immutable placementTarget selection on Buckets; the nine CNPG backup buckets should live on the ec (4/1) placement instead of 3-replica. Existing buckets cannot change placement, so after this merges the buckets get deleted and recreated on ec and fresh base backups are triggered (day-old backups are accepted losses, per Ben). - bump cephrgw-operator image and CRD ref to v0.4.0 - add placementTarget: ec to all nine cnpg backup Bucket CRs Reviewed-on: https://git.unkin.net/unkin/argocd-apps/pulls/312 Co-authored-by: Ben Vincent Co-committed-by: Ben Vincent --- apps/base/artifactapi/cnpg_backup.yaml | 1 + apps/base/authentik/cnpg_backup.yaml | 1 + apps/base/cephrgw-system/deployment.yaml | 2 +- apps/base/cephrgw-system/kustomization.yaml | 2 +- apps/base/encapi/cnpg_backup.yaml | 1 + apps/base/grafana/cnpg_backup.yaml | 1 + apps/base/litellm/cnpg_backup.yaml | 1 + apps/base/netbox/cnpg_backup.yaml | 1 + apps/base/paperclip/cnpg_backup.yaml | 1 + apps/base/puppet/cnpg_backup.yaml | 1 + apps/base/woodpecker/cnpg_backup.yaml | 1 + 11 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/base/artifactapi/cnpg_backup.yaml b/apps/base/artifactapi/cnpg_backup.yaml index ae94c34..e96d678 100644 --- a/apps/base/artifactapi/cnpg_backup.yaml +++ b/apps/base/artifactapi/cnpg_backup.yaml @@ -26,6 +26,7 @@ metadata: name: cnpg-artifactapi namespace: artifactapi spec: + placementTarget: ec bucketName: cnpg-artifactapi # The owner user has full control of its own bucket (read + write), which is # all the backup/restore identity needs — no extra BucketAccess grant. diff --git a/apps/base/authentik/cnpg_backup.yaml b/apps/base/authentik/cnpg_backup.yaml index 243ec38..a10a041 100644 --- a/apps/base/authentik/cnpg_backup.yaml +++ b/apps/base/authentik/cnpg_backup.yaml @@ -26,6 +26,7 @@ metadata: name: cnpg-authentik namespace: authentik spec: + placementTarget: ec bucketName: cnpg-authentik # The owner user has full control of its own bucket (read + write), which is # all the backup/restore identity needs — no extra BucketAccess grant. diff --git a/apps/base/cephrgw-system/deployment.yaml b/apps/base/cephrgw-system/deployment.yaml index 93a543f..d64ed0d 100644 --- a/apps/base/cephrgw-system/deployment.yaml +++ b/apps/base/cephrgw-system/deployment.yaml @@ -24,7 +24,7 @@ spec: runAsNonRoot: true containers: - name: operator - image: git.unkin.net/unkin/cephrgw-operator:v0.3.1 + image: git.unkin.net/unkin/cephrgw-operator:v0.4.0 args: - --metrics-bind-address=:8080 - --health-probe-bind-address=:8081 diff --git a/apps/base/cephrgw-system/kustomization.yaml b/apps/base/cephrgw-system/kustomization.yaml index 388fe1d..7e0a5a5 100644 --- a/apps/base/cephrgw-system/kustomization.yaml +++ b/apps/base/cephrgw-system/kustomization.yaml @@ -6,7 +6,7 @@ resources: - namespace.yaml # CRDs are pulled from the cephrgw-operator repo at the matching tag rather # than vendored here, so they never drift from the operator. - - https://git.unkin.net/unkin/cephrgw-operator/raw/tag/v0.3.1/config/crd/install.yaml + - https://git.unkin.net/unkin/cephrgw-operator/raw/tag/v0.4.0/config/crd/install.yaml - rbac.yaml - deployment.yaml - vaultauth.yaml diff --git a/apps/base/encapi/cnpg_backup.yaml b/apps/base/encapi/cnpg_backup.yaml index 630a7f6..a03ca84 100644 --- a/apps/base/encapi/cnpg_backup.yaml +++ b/apps/base/encapi/cnpg_backup.yaml @@ -26,6 +26,7 @@ metadata: name: cnpg-encapi namespace: encapi spec: + placementTarget: ec bucketName: cnpg-encapi # The owner user has full control of its own bucket (read + write), which is # all the backup/restore identity needs — no extra BucketAccess grant. diff --git a/apps/base/grafana/cnpg_backup.yaml b/apps/base/grafana/cnpg_backup.yaml index cdf5f7b..654d23b 100644 --- a/apps/base/grafana/cnpg_backup.yaml +++ b/apps/base/grafana/cnpg_backup.yaml @@ -26,6 +26,7 @@ metadata: name: cnpg-grafana namespace: grafana spec: + placementTarget: ec bucketName: cnpg-grafana # The owner user has full control of its own bucket (read + write), which is # all the backup/restore identity needs — no extra BucketAccess grant. diff --git a/apps/base/litellm/cnpg_backup.yaml b/apps/base/litellm/cnpg_backup.yaml index 4da6a3f..05710b0 100644 --- a/apps/base/litellm/cnpg_backup.yaml +++ b/apps/base/litellm/cnpg_backup.yaml @@ -26,6 +26,7 @@ metadata: name: cnpg-litellm namespace: litellm spec: + placementTarget: ec bucketName: cnpg-litellm # The owner user has full control of its own bucket (read + write), which is # all the backup/restore identity needs — no extra BucketAccess grant. diff --git a/apps/base/netbox/cnpg_backup.yaml b/apps/base/netbox/cnpg_backup.yaml index 6069e9a..bb4e2fd 100644 --- a/apps/base/netbox/cnpg_backup.yaml +++ b/apps/base/netbox/cnpg_backup.yaml @@ -25,6 +25,7 @@ metadata: name: cnpg-netbox namespace: netbox spec: + placementTarget: ec bucketName: cnpg-netbox ownerRef: cnpg-netbox-backup versioning: false diff --git a/apps/base/paperclip/cnpg_backup.yaml b/apps/base/paperclip/cnpg_backup.yaml index 75f6fb7..19660f2 100644 --- a/apps/base/paperclip/cnpg_backup.yaml +++ b/apps/base/paperclip/cnpg_backup.yaml @@ -26,6 +26,7 @@ metadata: name: cnpg-paperclip namespace: paperclip spec: + placementTarget: ec bucketName: cnpg-paperclip # The owner user has full control of its own bucket (read + write), which is # all the backup/restore identity needs — no extra BucketAccess grant. diff --git a/apps/base/puppet/cnpg_backup.yaml b/apps/base/puppet/cnpg_backup.yaml index b1c4384..0251a81 100644 --- a/apps/base/puppet/cnpg_backup.yaml +++ b/apps/base/puppet/cnpg_backup.yaml @@ -26,6 +26,7 @@ metadata: name: cnpg-puppet namespace: puppet spec: + placementTarget: ec bucketName: cnpg-puppet # The owner user has full control of its own bucket (read + write), which is # all the backup/restore identity needs — no extra BucketAccess grant. diff --git a/apps/base/woodpecker/cnpg_backup.yaml b/apps/base/woodpecker/cnpg_backup.yaml index 4606822..7dd023e 100644 --- a/apps/base/woodpecker/cnpg_backup.yaml +++ b/apps/base/woodpecker/cnpg_backup.yaml @@ -26,6 +26,7 @@ metadata: name: cnpg-woodpecker namespace: woodpecker spec: + placementTarget: ec bucketName: cnpg-woodpecker # The owner user has full control of its own bucket (read + write), which is # all the backup/restore identity needs — no extra BucketAccess grant.