Skip to content

Commit

Permalink
Merge branch 'main' into velero
Browse files Browse the repository at this point in the history
  • Loading branch information
codekow authored Nov 9, 2023
2 parents 0ec77ba + 366c13a commit a1e91ba
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
<<<<<<<< HEAD:components/operators/redhat-oadp-operator/instance/base/kustomization.yaml
- dpa.yaml
========
- descheduler.yaml
>>>>>>>> 366c13a (update: misc components (#37)):components/operators/cluster-kube-descheduler-operator/instance/base/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

resources:
<<<<<<<< HEAD:components/operators/proactive-node-scaling-operator/operator/base/kustomization.yaml
- namespace.yaml
- operator-group.yaml
- subscription.yaml
========
- dpa.yaml
>>>>>>>> 56a2b1f (add: velero config):components/operators/redhat-oadp-operator/instance/base/kustomization.yaml
10 changes: 10 additions & 0 deletions dump/local-storage/local-disk-block-sc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
kind: StorageClass
apiVersion: storage.k8s.io/v1
metadata:
name: local-disks-block
labels:
local.storage.openshift.io/owner-name: local-disks-block
local.storage.openshift.io/owner-namespace: openshift-local-storage
provisioner: kubernetes.io/no-provisioner
reclaimPolicy: Delete
volumeBindingMode: WaitForFirstConsumer
6 changes: 6 additions & 0 deletions dump/local-storage/local-volume-discovery.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: local.storage.openshift.io/v1alpha1
kind: LocalVolumeDiscovery
metadata:
name: auto-discover-devices
namespace: openshift-local-storage
spec: {}
22 changes: 22 additions & 0 deletions dump/local-storage/local-volume-set-block.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
apiVersion: local.storage.openshift.io/v1alpha1
kind: LocalVolumeSet
metadata:
name: local-disks-block
namespace: openshift-local-storage
spec:
nodeSelector:
nodeSelectorTerms:
- matchExpressions:
- key: kubernetes.io/hostname
operator: In
values:
- se350-04.edge.lab
- se350-05.edge.lab
- se350-06.edge.lab
storageClassName: local-disks-block
volumeMode: Block
deviceInclusionSpec:
deviceTypes:
- disk
# - part
minSize: 100G

0 comments on commit a1e91ba

Please sign in to comment.