diff --git a/components/operators/cluster-kube-descheduler-operator/instance/base/kustomization.yaml b/components/operators/cluster-kube-descheduler-operator/instance/base/kustomization.yaml index 3a56e7be..e2bb1cc2 100644 --- a/components/operators/cluster-kube-descheduler-operator/instance/base/kustomization.yaml +++ b/components/operators/cluster-kube-descheduler-operator/instance/base/kustomization.yaml @@ -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 diff --git a/components/operators/proactive-node-scaling-operator/operator/base/kustomization.yaml b/components/operators/proactive-node-scaling-operator/operator/base/kustomization.yaml index dcff6622..1e66bd5f 100644 --- a/components/operators/proactive-node-scaling-operator/operator/base/kustomization.yaml +++ b/components/operators/proactive-node-scaling-operator/operator/base/kustomization.yaml @@ -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 diff --git a/dump/local-storage/local-disk-block-sc.yaml b/dump/local-storage/local-disk-block-sc.yaml new file mode 100644 index 00000000..53449a4a --- /dev/null +++ b/dump/local-storage/local-disk-block-sc.yaml @@ -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 diff --git a/dump/local-storage/local-volume-discovery.yaml b/dump/local-storage/local-volume-discovery.yaml new file mode 100644 index 00000000..0429c035 --- /dev/null +++ b/dump/local-storage/local-volume-discovery.yaml @@ -0,0 +1,6 @@ +apiVersion: local.storage.openshift.io/v1alpha1 +kind: LocalVolumeDiscovery +metadata: + name: auto-discover-devices + namespace: openshift-local-storage +spec: {} diff --git a/dump/local-storage/local-volume-set-block.yaml b/dump/local-storage/local-volume-set-block.yaml new file mode 100644 index 00000000..6094a27d --- /dev/null +++ b/dump/local-storage/local-volume-set-block.yaml @@ -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