Skip to content

Commit 3e03ace

Browse files
committed
(cluster/lukay) migration rke1 -> rke2
1 parent a4c2cd5 commit 3e03ace

25 files changed

+53
-507
lines changed

fleet/lib/rook-ceph-cluster/overlays/lukay/values.yaml

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,61 @@
11
---
22
cephClusterSpec:
3-
# XXX allow upgrade even if not healthy because lukay05 was removed
4-
continueUpgradeAfterChecksEvenIfNotHealthy: true
53
mon:
64
count: 3
5+
cephConfig:
6+
global:
7+
osd_pool_default_pg_autoscale_mode: warn
8+
rgw_override_bucket_index_max_shards: "401"
9+
rgw_enable_usage_log: "false"
10+
mgr:
11+
mgr/balancer/upmap_max_deviation: "1"
12+
osd:
13+
osd_max_pg_per_osd_hard_ratio: "10"
14+
osd_op_queue: wpq
15+
osd_scrub_auto_repair: "true"
716
storage:
817
useAllNodes: false
918
useAllDevices: false
1019
config:
11-
osdsPerDevice: "3"
20+
osdsPerDevice: "1"
21+
encryptedDevice: "true"
1222
nodes:
1323
- name: lukay01
1424
devices:
15-
- name: sda
16-
- name: sdb
17-
- name: sdc
18-
- name: sdd
19-
- name: sde
20-
- name: sdf
21-
- name: sdg
22-
- name: sdh
23-
- name: sdi
24-
- name: sdj
25+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R702912N
26+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R702901H
27+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R702902M
28+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R702906Y
29+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R702936A
30+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R704221R
31+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R702953P
32+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R804983Z
33+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R702951K
34+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R702385N
2535
- name: lukay02
2636
devices:
27-
- name: sda
28-
- name: sdb
29-
- name: sdc
30-
- name: sdd
31-
- name: sde
32-
- name: sdf
33-
- name: sdg
34-
- name: sdh
35-
- name: sdi
36-
- name: sdj
37+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R705147R
38+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R705139Z
39+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R705153V
40+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R705479L
41+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R705487X
42+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R705492F
43+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R705485Y
44+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R705109K
45+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R705141T
46+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R805000T
3747
- name: lukay03
3848
devices:
39-
- name: sda
40-
- name: sdb
41-
- name: sdc
42-
- name: sdd
43-
- name: sde
44-
- name: sdf
45-
- name: sdg
46-
- name: sdh
47-
- name: sdi
48-
- name: sdj
49-
- name: lukay04
50-
devices:
51-
- name: sda
52-
- name: sdb
53-
- name: sdc
54-
- name: sdd
55-
- name: sde
56-
- name: sdf
57-
- name: sdg
58-
- name: sdh
59-
- name: sdi
60-
- name: sdj
61-
resources:
62-
osd:
63-
requests:
64-
cpu: 100m
65-
memory: 4Gi
49+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R704207V
50+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R804245D
51+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R802783P
52+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R802782B
53+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R804846V
54+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R802794M
55+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0RA02831V
56+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0RA02160A
57+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R801805Z
58+
- name: /dev/disk/by-id/scsi-SATA_Samsung_SSD_870_S5VUNJ0R804287J
6659

6760
cephBlockPools:
6861
- name: replicapool
@@ -74,12 +67,19 @@ cephBlockPools:
7467
quotas:
7568
maxSize: 2Ti
7669
enableRBDStats: true
70+
parameters:
71+
nodelete: "true"
72+
nosizechange: "true"
73+
pg_autoscale_mode: "off"
74+
pg_num: "32"
7775
storageClass:
7876
name: rook-ceph-block
7977
enabled: true
8078
isDefault: true
8179
reclaimPolicy: Delete
8280
allowVolumeExpansion: true
81+
mountOptions:
82+
- discard
8383
parameters:
8484
clusterID: rook-ceph
8585
pool: replicapool

lukay/README.md

Lines changed: 0 additions & 56 deletions
This file was deleted.

lukay/external-secrets/README.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

lukay/external-secrets/external-secrets.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

lukay/external-secrets/fetch-credentials.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

lukay/rke/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

lukay/rke/Makefile

Lines changed: 0 additions & 1 deletion
This file was deleted.

lukay/rke/cluster.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

lukay/rook-ceph/scripts/rook-ceph-node-cleanup.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

lukay/velero/resources/backupstoragelocation.yaml

Lines changed: 0 additions & 30 deletions
This file was deleted.

0 commit comments

Comments
 (0)