From 32aff74355d3e4b659299d13fac1607bfb08f5b2 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Wed, 22 Jun 2022 17:27:30 -0400
Subject: [PATCH] [WIP] Configure ODF for NESE storage

Attempt to configure an ODF external storage cluster. It looks as if
the APIs have changed since we did this with 4.8, so we need to figure
out what impact this has on the required manifests.

x-branch: feature/odf
---
 .../ocs-external-storagecluster/kustomization.yaml        | 5 +++++
 .../ocs-external-storagecluster/storagecluster.yaml       | 7 +++++++
 .../storagesystems/ocs-system/kustomization.yaml          | 5 +++++
 .../storagesystems/ocs-system/storagesystem.yaml          | 8 ++++++++
 cluster-scope/bundles/odf-external/kustomization.yaml     | 6 ++++++
 cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml  | 2 +-
 6 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 cluster-scope/base/odf.openshift.io/storageclusters/ocs-external-storagecluster/kustomization.yaml
 create mode 100644 cluster-scope/base/odf.openshift.io/storageclusters/ocs-external-storagecluster/storagecluster.yaml
 create mode 100644 cluster-scope/base/odf.openshift.io/storagesystems/ocs-system/kustomization.yaml
 create mode 100644 cluster-scope/base/odf.openshift.io/storagesystems/ocs-system/storagesystem.yaml
 create mode 100644 cluster-scope/bundles/odf-external/kustomization.yaml

diff --git a/cluster-scope/base/odf.openshift.io/storageclusters/ocs-external-storagecluster/kustomization.yaml b/cluster-scope/base/odf.openshift.io/storageclusters/ocs-external-storagecluster/kustomization.yaml
new file mode 100644
index 00000000..94088800
--- /dev/null
+++ b/cluster-scope/base/odf.openshift.io/storageclusters/ocs-external-storagecluster/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: openshift-storage
+resources:
+    - storagecluster.yaml
diff --git a/cluster-scope/base/odf.openshift.io/storageclusters/ocs-external-storagecluster/storagecluster.yaml b/cluster-scope/base/odf.openshift.io/storageclusters/ocs-external-storagecluster/storagecluster.yaml
new file mode 100644
index 00000000..badfa9e1
--- /dev/null
+++ b/cluster-scope/base/odf.openshift.io/storageclusters/ocs-external-storagecluster/storagecluster.yaml
@@ -0,0 +1,7 @@
+apiVersion: odf.openshift.io/v1
+kind: StorageCluster
+metadata:
+  name: ocs-external-storagecluster
+spec:
+  externalStorage:
+    enable: true
diff --git a/cluster-scope/base/odf.openshift.io/storagesystems/ocs-system/kustomization.yaml b/cluster-scope/base/odf.openshift.io/storagesystems/ocs-system/kustomization.yaml
new file mode 100644
index 00000000..b32ae01e
--- /dev/null
+++ b/cluster-scope/base/odf.openshift.io/storagesystems/ocs-system/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: openshift-storage
+resources:
+  - storagesystem.yaml
diff --git a/cluster-scope/base/odf.openshift.io/storagesystems/ocs-system/storagesystem.yaml b/cluster-scope/base/odf.openshift.io/storagesystems/ocs-system/storagesystem.yaml
new file mode 100644
index 00000000..ee4d354a
--- /dev/null
+++ b/cluster-scope/base/odf.openshift.io/storagesystems/ocs-system/storagesystem.yaml
@@ -0,0 +1,8 @@
+apiVersion: odf.openshift.io/v1alpha1
+kind: StorageSystem
+metadata:
+  name: ocs-system
+spec:
+  kind: storagecluster.ocs.openshift.io/v1
+  name: ocs-storagecluster
+  namespace: openshift-storage
diff --git a/cluster-scope/bundles/odf-external/kustomization.yaml b/cluster-scope/bundles/odf-external/kustomization.yaml
new file mode 100644
index 00000000..de94a44a
--- /dev/null
+++ b/cluster-scope/bundles/odf-external/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../odf
+- ../../base/odf.openshift.io/storagesystems/ocs-system
+- ../../base/odf.openshift.io/storageclusters/ocs-external-storagecluster
diff --git a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml
index 61e931cd..48b7187a 100644
--- a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml
+++ b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml
@@ -6,7 +6,7 @@ resources:
 - ../common
 - ../../bundles/openshift-gitops
 - ../../bundles/acm
-- ../../bundles/odf
+- ../../bundles/odf-external
 - clusterversion.yaml
 
 patches: