diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml deleted file mode 100644 index e1d354e0..00000000 --- a/.pre-commit-config.yaml +++ /dev/null @@ -1,28 +0,0 @@ -fail_fast: false -repos: -- repo: https://github.com/adrienverge/yamllint - rev: v1.26.3 - hooks: - - args: - - -c - - .github/yamllint.config.yaml - id: yamllint -- repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.0.1 - hooks: - - id: trailing-whitespace - - id: end-of-file-fixer - - id: mixed-line-ending -- repo: https://github.com/Lucas-C/pre-commit-hooks - rev: v1.1.10 - hooks: - - id: remove-crlf - - id: remove-tabs -- repo: https://github.com/sirosen/fix-smartquotes - rev: 0.2.0 - hooks: - - id: fix-smartquotes -- repo: https://github.com/k8s-at-home/sops-pre-commit - rev: v2.0.3 - hooks: - - id: forbid-secrets diff --git a/cluster/core/rook-ceph/rook-direct-mount/deployment.yaml b/cluster/core/rook-ceph/rook-direct-mount/deployment.yaml index 72193f8a..5f42d537 100644 --- a/cluster/core/rook-ceph/rook-direct-mount/deployment.yaml +++ b/cluster/core/rook-ceph/rook-direct-mount/deployment.yaml @@ -45,6 +45,10 @@ spec: name: libmodules - name: mon-endpoint-volume mountPath: /etc/rook + - name: backups + mountPath: /mnt/backups + - name: direct-mount-backup-script + mountPath: /scripts # if hostNetwork: false, the "rbd map" command hangs, see https://github.com/rook/rook/issues/2021 hostNetwork: true volumes: @@ -63,3 +67,13 @@ spec: items: - key: data path: mon-endpoints + - name: backups + nfs: + server: 10.75.30.15 + path: /tank/data/ceph/backups + - name: direct-mount-backup-script + projected: + defaultMode: 0775 + sources: + - configMap: + name: direct-mount-backup-script diff --git a/cluster/core/rook-ceph/rook-direct-mount/kustomization.yaml b/cluster/core/rook-ceph/rook-direct-mount/kustomization.yaml index 42835f53..eedc1bad 100644 --- a/cluster/core/rook-ceph/rook-direct-mount/kustomization.yaml +++ b/cluster/core/rook-ceph/rook-direct-mount/kustomization.yaml @@ -1,4 +1,14 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: rook-ceph resources: -- deployment.yaml + - deployment.yaml +configMapGenerator: + - name: direct-mount-backup-script + files: + - backup.sh +generatorOptions: + disableNameSuffixHash: true + annotations: + kustomize.toolkit.fluxcd.io/substitute: disabled