Skip to content

Commit 8ff4bb0

Browse files
authored
Merge pull request #1478 from lsst-it/IT-5665/rke2-backups
(role/rke2{agent,server}) update backup dirs to include rke2 tls certs
2 parents 33ef79c + b7e13a8 commit 8ff4bb0

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

hieradata/role/rke2agent.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ restic::repositories:
1717
backup_path:
1818
- "/etc/cni"
1919
- "/etc/rancher"
20-
- "/var/lib/rancher/rke2/agent"
20+
- "/var/lib/rancher/rke2"
2121
- "/var/lib/rook"
22-
backup_flags: "--exclude=/var/lib/rook/rook-ceph/log"
22+
backup_flags:
23+
- "--exclude=/var/lib/rancher/rke2/agent/containerd"
24+
- "--exclude=/var/lib/rancher/rke2/agent/logs"
25+
- "--exclude=/var/lib/rook/rook-ceph/log"
2326
backup_timer: "*-*-* 09:00:00"
2427
enable_forget: true
2528
forget_timer: "Mon..Sun 23:00:00"

hieradata/role/rke2server.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,12 @@ restic::repositories:
105105
backup_path:
106106
- "/etc/cni"
107107
- "/etc/rancher"
108-
- "/var/lib/rancher/rke2/server/db/snapshots"
108+
- "/var/lib/rancher/rke2"
109109
- "/var/lib/rook"
110-
backup_flags: "--exclude=/var/lib/rook/rook-ceph/log"
110+
backup_flags:
111+
- "--exclude=/var/lib/rancher/rke2/agent/containerd"
112+
- "--exclude=/var/lib/rancher/rke2/agent/logs"
113+
- "--exclude=/var/lib/rook/rook-ceph/log"
111114
backup_timer: "*-*-* 09:00:00"
112115
enable_forget: true
113116
forget_timer: "Mon..Sun 23:00:00"

spec/hosts/roles/rke2agent_spec.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,14 @@
5252
backup_path: %w[
5353
/etc/cni
5454
/etc/rancher
55-
/var/lib/rancher/rke2/agent
55+
/var/lib/rancher/rke2
5656
/var/lib/rook
5757
],
58-
backup_flags: '--exclude=/var/lib/rook/rook-ceph/log',
58+
backup_flags: %w[
59+
--exclude=/var/lib/rancher/rke2/agent/containerd
60+
--exclude=/var/lib/rancher/rke2/agent/logs
61+
--exclude=/var/lib/rook/rook-ceph/log
62+
],
5963
backup_timer: '*-*-* 09:00:00',
6064
enable_forget: true,
6165
forget_timer: 'Mon..Sun 23:00:00',

spec/hosts/roles/rke2server_spec.rb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,14 @@
6666
backup_path: %w[
6767
/etc/cni
6868
/etc/rancher
69-
/var/lib/rancher/rke2/server/db/snapshots
69+
/var/lib/rancher/rke2
7070
/var/lib/rook
7171
],
72-
backup_flags: '--exclude=/var/lib/rook/rook-ceph/log',
72+
backup_flags: %w[
73+
--exclude=/var/lib/rancher/rke2/agent/containerd
74+
--exclude=/var/lib/rancher/rke2/agent/logs
75+
--exclude=/var/lib/rook/rook-ceph/log
76+
],
7377
backup_timer: '*-*-* 09:00:00',
7478
enable_forget: true,
7579
forget_timer: 'Mon..Sun 23:00:00',

0 commit comments

Comments
 (0)