Skip to content

Commit 2a183bc

Browse files
authored
feat: diverge localstorage for Zero and Rick (#851)
Signed-off-by: Tomas Coufal <tcoufal@redhat.com>
1 parent 80adfab commit 2a183bc

File tree

6 files changed

+47
-25
lines changed

6 files changed

+47
-25
lines changed

local-storage/base/kustomization.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
11
---
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
4-
5-
namespace: local-storage
6-
7-
resources:
8-
- localstorage.yaml

local-storage/base/localstorage.yaml

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
apiVersion: kustomize.config.k8s.io/v1beta1
3+
kind: Kustomization
4+
namespace: openshift-local-storage
5+
resources:
6+
- ../../../base
7+
- localvolumeset.yaml
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
apiVersion: local.storage.openshift.io/v1alpha1
2+
kind: LocalVolumeSet
3+
metadata:
4+
name: local-disks
5+
namespace: openshift-local-storage
6+
spec:
7+
deviceInclusionSpec:
8+
deviceMechanicalProperties:
9+
- NonRotational
10+
deviceTypes:
11+
- disk
12+
- part
13+
minSize: 1Gi
14+
nodeSelector:
15+
nodeSelectorTerms:
16+
- matchExpressions:
17+
- key: kubernetes.io/hostname
18+
operator: In
19+
values:
20+
- host05.emea.operate-first.cloud
21+
- host06.emea.operate-first.cloud
22+
- host07.emea.operate-first.cloud
23+
storageClassName: local-disks
24+
tolerations:
25+
- effect: NoSchedule
26+
key: node.ocs.openshift.io/storage
27+
operator: Equal
28+
value: "true"
29+
volumeMode: Block
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
---
22
apiVersion: kustomize.config.k8s.io/v1beta1
33
kind: Kustomization
4-
4+
namespace: local-storage
55
resources:
66
- ../../../base
7-
8-
patchesStrategicMerge:
9-
- localstorage_patch.yaml
7+
- localstorage.yaml

local-storage/overlays/moc/zero/localstorage_patch.yaml renamed to local-storage/overlays/moc/zero/localstorage.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ kind: LocalVolume
44
metadata:
55
name: localblock
66
spec:
7+
logLevel: Normal
8+
managementState: Managed
9+
nodeSelector:
10+
nodeSelectorTerms:
11+
- matchExpressions:
12+
- key: cluster.ocs.openshift.io/openshift-storage
13+
operator: In
14+
values:
15+
- ""
716
storageClassDevices:
817
- devicePaths:
918
- /dev/disk/by-id/scsi-36c81f660d0a47e0026e3bc8686d39c5d

0 commit comments

Comments
 (0)