From d80e9a65b6c4888b54f59417fe66ffb20b2e015b Mon Sep 17 00:00:00 2001 From: Micke Nordin Date: Fri, 7 Feb 2025 16:03:15 +0100 Subject: [PATCH] Missing comma --- backups/base/backup-cronjob.yaml | 2 +- backups/base/kustomization.yaml | 6 ++++-- backups/overlays/test/xrootd/backup-cronjob.yaml | 3 --- backups/overlays/test/xrootd/kustomization.yaml | 10 +++++----- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/backups/base/backup-cronjob.yaml b/backups/base/backup-cronjob.yaml index 1d7624c..100da8b 100644 --- a/backups/base/backup-cronjob.yaml +++ b/backups/base/backup-cronjob.yaml @@ -19,7 +19,7 @@ spec: - name: backup-container image: docker.sunet.se/drive/duplicity:bookworm-slim-1 command: ["bash"] - args: [ "-c" "duplicity /backup_storage rclone://destination:$(BUCKET) --no-encryption --full-if-older-than 1M; touch /backup_ipc/stop" ] + args: [ "-c", "duplicity /backup_storage rclone://destination:$(BUCKET) --no-encryption --full-if-older-than 1M; touch /backup_ipc/stop" ] env: - name: RCLONE_CONFIG_DESTINATION_ACL value: private diff --git a/backups/base/kustomization.yaml b/backups/base/kustomization.yaml index b534140..7707ba7 100644 --- a/backups/base/kustomization.yaml +++ b/backups/base/kustomization.yaml @@ -1,2 +1,4 @@ -resources: - - backup-cronjob.yaml +--- +kind: Kustomization +apiVersion: kustomize.config.k8s.io/v1beta1 +resources: ['backup-cronjob.yaml'] diff --git a/backups/overlays/test/xrootd/backup-cronjob.yaml b/backups/overlays/test/xrootd/backup-cronjob.yaml index e53d751..477cf23 100644 --- a/backups/overlays/test/xrootd/backup-cronjob.yaml +++ b/backups/overlays/test/xrootd/backup-cronjob.yaml @@ -38,6 +38,3 @@ spec: secretKeyRef: name: xrootd-secret key: "source-secret-access-key" - livenessProbe: - exec: - command: ["bash", "-c", "if test -f /backup_ipc/stop; then umount /backup_storage; exit 1; fi;"] diff --git a/backups/overlays/test/xrootd/kustomization.yaml b/backups/overlays/test/xrootd/kustomization.yaml index 06bf611..2fcc51c 100644 --- a/backups/overlays/test/xrootd/kustomization.yaml +++ b/backups/overlays/test/xrootd/kustomization.yaml @@ -1,7 +1,7 @@ -apiVersion: 'kustomize.config.k8s.io/v1beta1' +--- kind: Kustomization -bases: -- ../../../base -patchesStrategicMerge: - - backup-cronjob.yaml +apiVersion: kustomize.config.k8s.io/v1beta1 +resources: [../../../base] +patches: + - path: backup-cronjob.yaml