Skip to content

Commit 793cdeb

Browse files
committed
replace openebs jiva by mayastor
1 parent fcd5793 commit 793cdeb

File tree

10 files changed

+168
-10
lines changed

10 files changed

+168
-10
lines changed

infrastructure/talos/home/talconfig.yaml

Lines changed: 57 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,18 @@ nodes:
1616
- hostname: control-plane-vdcj
1717
ipAddress: 192.168.2.141
1818
controlPlane: true
19+
patches:
20+
- |-
21+
- op: add
22+
path: /machine/kubelet/extraMounts
23+
value:
24+
- destination: /var/openebs/local
25+
type: bind
26+
source: /var/openebs/local
27+
options:
28+
- rbind
29+
- rshared
30+
- rw
1931
schematic:
2032
customization:
2133
extraKernelArgs:
@@ -39,6 +51,18 @@ nodes:
3951
- hostname: control-plane-hiuw
4052
ipAddress: 192.168.2.146
4153
controlPlane: true
54+
patches:
55+
- |-
56+
- op: add
57+
path: /machine/kubelet/extraMounts
58+
value:
59+
- destination: /var/openebs/local
60+
type: bind
61+
source: /var/openebs/local
62+
options:
63+
- rbind
64+
- rshared
65+
- rw
4266
schematic:
4367
customization:
4468
extraKernelArgs:
@@ -62,6 +86,18 @@ nodes:
6286
- hostname: control-plane-eqwd
6387
ipAddress: 192.168.2.134
6488
controlPlane: true
89+
patches:
90+
- |-
91+
- op: add
92+
path: /machine/kubelet/extraMounts
93+
value:
94+
- destination: /var/openebs/local
95+
type: bind
96+
source: /var/openebs/local
97+
options:
98+
- rbind
99+
- rshared
100+
- rw
65101
schematic:
66102
customization:
67103
extraKernelArgs:
@@ -86,6 +122,11 @@ nodes:
86122
ipAddress: 192.168.2.128
87123
controlPlane: false
88124
patches:
125+
- |-
126+
- op: add
127+
path: /machine/sysctls
128+
value:
129+
vm.nr_hugepages: "2048"
89130
- |-
90131
- op: add
91132
path: /machine/kubelet/extraMounts
@@ -94,7 +135,7 @@ nodes:
94135
type: bind
95136
source: /var/openebs/local
96137
options:
97-
- bind
138+
- rbind
98139
- rshared
99140
- rw
100141
schematic:
@@ -112,7 +153,7 @@ nodes:
112153
hardwareAddr: "ec:8e:b5:6f:0d:73"
113154
disableSearchDomain: true
114155
nodeLabels:
115-
openebs.io/data-plane: "true"
156+
openebs.io/engine: mayastor
116157
installDiskSelector:
117158
type: ssd
118159
busPath: /pci0000:00/0000:00:17.0/ata1/host0/target0:0:0/0:0:0:0/
@@ -124,6 +165,11 @@ nodes:
124165
ipAddress: 192.168.2.148
125166
controlPlane: false
126167
patches:
168+
- |-
169+
- op: add
170+
path: /machine/sysctls
171+
value:
172+
vm.nr_hugepages: "2048"
127173
- |-
128174
- op: add
129175
path: /machine/kubelet/extraMounts
@@ -132,7 +178,7 @@ nodes:
132178
type: bind
133179
source: /var/openebs/local
134180
options:
135-
- bind
181+
- rbind
136182
- rshared
137183
- rw
138184
schematic:
@@ -150,7 +196,7 @@ nodes:
150196
hardwareAddr: "ec:8e:b5:6f:0b:df"
151197
disableSearchDomain: true
152198
nodeLabels:
153-
openebs.io/data-plane: "true"
199+
openebs.io/engine: mayastor
154200
installDiskSelector:
155201
type: ssd
156202
busPath: /pci0000:00/0000:00:17.0/ata1/host0/target0:0:0/0:0:0:0/
@@ -162,6 +208,11 @@ nodes:
162208
ipAddress: 192.168.2.126
163209
controlPlane: false
164210
patches:
211+
- |-
212+
- op: add
213+
path: /machine/sysctls
214+
value:
215+
vm.nr_hugepages: "2048"
165216
- |-
166217
- op: add
167218
path: /machine/kubelet/extraMounts
@@ -170,7 +221,7 @@ nodes:
170221
type: bind
171222
source: /var/openebs/local
172223
options:
173-
- bind
224+
- rbind
174225
- rshared
175226
- rw
176227
schematic:
@@ -188,7 +239,7 @@ nodes:
188239
hardwareAddr: "40:b0:34:fa:e0:d3"
189240
disableSearchDomain: true
190241
nodeLabels:
191-
openebs.io/data-plane: "true"
242+
openebs.io/engine: mayastor
192243
installDiskSelector:
193244
type: ssd
194245
busPath: /pci0000:00/0000:00:17.0/ata1/host0/target0:0:0/0:0:0:0/

kubernetes/home/apps/storage/kustomization.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
44
resources:
55
- namespace.yaml
6-
- ./openebs-jiva/ks.yaml
6+
# - ./openebs-jiva/ks.yaml
7+
- ./openebs-mayastor/ks.yaml
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
apiVersion: helm.toolkit.fluxcd.io/v2beta2
3+
kind: HelmRelease
4+
metadata:
5+
name: openebs-mayastor
6+
namespace: storage
7+
spec:
8+
chart:
9+
spec:
10+
chart: mayastor
11+
reconcileStrategy: ChartVersion
12+
sourceRef:
13+
kind: HelmRepository
14+
name: openebs-mayastor
15+
namespace: flux-system
16+
version: 2.6.0
17+
interval: 1m0s
18+
values:
19+
etcd:
20+
localpvScConfig:
21+
basePath: "/var/openebs/local/localpv-hostpath/etcd"
22+
loki-stack:
23+
enabled: false
24+
obs:
25+
callhome:
26+
enabled: false
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
resources:
5+
- helmrelease.yaml
6+
- storageclass.yaml
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
allowVolumeExpansion: true
2+
apiVersion: storage.k8s.io/v1
3+
kind: StorageClass
4+
metadata:
5+
name: openebs-mayastor-dual-replica
6+
parameters:
7+
protocol: nvmf
8+
repl: "2"
9+
provisioner: io.openebs.csi-mayastor
10+
reclaimPolicy: Delete
11+
volumeBindingMode: Immediate
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
apiVersion: "openebs.io/v1beta2"
2+
kind: DiskPool
3+
metadata:
4+
name: pool-jsai
5+
namespace: storage
6+
spec:
7+
node: worker-jsai
8+
disks: ["/dev/nvme0n1"]
9+
---
10+
apiVersion: "openebs.io/v1beta2"
11+
kind: DiskPool
12+
metadata:
13+
name: pool-dsfg
14+
namespace: storage
15+
spec:
16+
node: worker-dsfg
17+
disks: ["/dev/nvme0n1"]
18+
---
19+
apiVersion: "openebs.io/v1beta2"
20+
kind: DiskPool
21+
metadata:
22+
name: pool-ajkf
23+
namespace: storage
24+
spec:
25+
node: worker-ajkf
26+
disks: ["/dev/nvme0n1"]
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
resources:
5+
- diskpool.yaml
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
---
2+
apiVersion: kustomize.toolkit.fluxcd.io/v1
3+
kind: Kustomization
4+
metadata:
5+
name: openebs-mayastor-app
6+
namespace: flux-system
7+
spec:
8+
targetNamespace: storage
9+
interval: 10m
10+
path: "./kubernetes/home/apps/storage/openebs-mayastor/app"
11+
prune: true
12+
sourceRef:
13+
kind: GitRepository
14+
name: flux-system
15+
wait: true
16+
---
17+
apiVersion: kustomize.toolkit.fluxcd.io/v1
18+
kind: Kustomization
19+
metadata:
20+
name: openebs-mayastor-config
21+
namespace: flux-system
22+
spec:
23+
targetNamespace: storage
24+
interval: 10m
25+
path: "./kubernetes/home/apps/storage/openebs-mayastor/config"
26+
prune: true
27+
sourceRef:
28+
kind: GitRepository
29+
name: flux-system
30+
wait: true
31+
dependsOn:
32+
- name: openebs-mayastor-app

kubernetes/home/flux/repositories/helm/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ resources:
1515
- ./itzg-minecraft.yaml
1616
- ./jetstack.yaml
1717
- ./mongodb.yaml
18-
- ./openebs-jiva.yaml
18+
- ./openebs-mayastor.yaml
1919
- ./ot-container-kit.yaml
2020
- ./prometheus-community.yaml
2121
- ./renovate.yaml

kubernetes/home/flux/repositories/helm/openebs-jiva.yaml renamed to kubernetes/home/flux/repositories/helm/openebs-mayastor.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
apiVersion: source.toolkit.fluxcd.io/v1beta2
33
kind: HelmRepository
44
metadata:
5-
name: openebs-jiva
5+
name: openebs-mayastor
66
namespace: flux-system
77
spec:
88
interval: 1m0s
9-
url: https://openebs.github.io/jiva-operator
9+
url: https://openebs.github.io/mayastor-extensions/

0 commit comments

Comments
 (0)