Skip to content

Commit e0c740b

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

File tree

9 files changed

+108
-31
lines changed

9 files changed

+108
-31
lines changed

infrastructure/talos/home/talconfig.yaml

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,9 @@ nodes:
8888
patches:
8989
- |-
9090
- op: add
91-
path: /machine/kubelet/extraMounts
91+
path: /machine/sysctls
9292
value:
93-
- destination: /var/openebs/local
94-
type: bind
95-
source: /var/openebs/local
96-
options:
97-
- bind
98-
- rshared
99-
- rw
93+
vm.nr_hugepages: "1024"
10094
schematic:
10195
customization:
10296
extraKernelArgs:
@@ -112,7 +106,7 @@ nodes:
112106
hardwareAddr: "ec:8e:b5:6f:0d:73"
113107
disableSearchDomain: true
114108
nodeLabels:
115-
openebs.io/data-plane: "true"
109+
openebs.io/engine: mayastor
116110
installDiskSelector:
117111
type: ssd
118112
busPath: /pci0000:00/0000:00:17.0/ata1/host0/target0:0:0/0:0:0:0/
@@ -126,15 +120,9 @@ nodes:
126120
patches:
127121
- |-
128122
- op: add
129-
path: /machine/kubelet/extraMounts
123+
path: /machine/sysctls
130124
value:
131-
- destination: /var/openebs/local
132-
type: bind
133-
source: /var/openebs/local
134-
options:
135-
- bind
136-
- rshared
137-
- rw
125+
vm.nr_hugepages: "1024"
138126
schematic:
139127
customization:
140128
extraKernelArgs:
@@ -150,7 +138,7 @@ nodes:
150138
hardwareAddr: "ec:8e:b5:6f:0b:df"
151139
disableSearchDomain: true
152140
nodeLabels:
153-
openebs.io/data-plane: "true"
141+
openebs.io/engine: mayastor
154142
installDiskSelector:
155143
type: ssd
156144
busPath: /pci0000:00/0000:00:17.0/ata1/host0/target0:0:0/0:0:0:0/
@@ -164,15 +152,9 @@ nodes:
164152
patches:
165153
- |-
166154
- op: add
167-
path: /machine/kubelet/extraMounts
155+
path: /machine/sysctls
168156
value:
169-
- destination: /var/openebs/local
170-
type: bind
171-
source: /var/openebs/local
172-
options:
173-
- bind
174-
- rshared
175-
- rw
157+
vm.nr_hugepages: "1024"
176158
schematic:
177159
customization:
178160
extraKernelArgs:
@@ -188,7 +170,7 @@ nodes:
188170
hardwareAddr: "40:b0:34:fa:e0:d3"
189171
disableSearchDomain: true
190172
nodeLabels:
191-
openebs.io/data-plane: "true"
173+
openebs.io/engine: mayastor
192174
installDiskSelector:
193175
type: ssd
194176
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: 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+
- helmrelease.yaml
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)