From 2187189b9883334c22f16fed5ed3296179faa419 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Fri, 17 Jun 2022 15:58:42 -0400
Subject: [PATCH] =?UTF-8?q?Install=20OpenShift=20Data=20Foundation=20(ODF,?=
 =?UTF-8?q?=20n=C3=A9e=20OCS)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We need ODF in order to support persistent volumes.

This commit only installs the operator, but does not configure
storage.

x-branch: feature/odf
---
 .../namespaces/openshift-storage/kustomization.yaml    |  4 ++++
 .../core/namespaces/openshift-storage/namespace.yaml   |  5 +++++
 .../openshift-storage/kustomization.yaml               |  5 +++++
 .../openshift-storage/operatorgroup.yaml               |  7 +++++++
 .../subscriptions/odf-operator/kustomization.yaml      |  5 +++++
 .../subscriptions/odf-operator/subscription.yaml       | 10 ++++++++++
 cluster-scope/bundles/odf/kustomization.yaml           |  6 ++++++
 .../overlays/nerc-ocp-infra/kustomization.yaml         |  1 +
 8 files changed, 43 insertions(+)
 create mode 100644 cluster-scope/base/core/namespaces/openshift-storage/kustomization.yaml
 create mode 100644 cluster-scope/base/core/namespaces/openshift-storage/namespace.yaml
 create mode 100644 cluster-scope/base/operators.coreos.com/operatorgroups/openshift-storage/kustomization.yaml
 create mode 100644 cluster-scope/base/operators.coreos.com/operatorgroups/openshift-storage/operatorgroup.yaml
 create mode 100644 cluster-scope/base/operators.coreos.com/subscriptions/odf-operator/kustomization.yaml
 create mode 100644 cluster-scope/base/operators.coreos.com/subscriptions/odf-operator/subscription.yaml
 create mode 100644 cluster-scope/bundles/odf/kustomization.yaml

diff --git a/cluster-scope/base/core/namespaces/openshift-storage/kustomization.yaml b/cluster-scope/base/core/namespaces/openshift-storage/kustomization.yaml
new file mode 100644
index 00000000..c313b540
--- /dev/null
+++ b/cluster-scope/base/core/namespaces/openshift-storage/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- namespace.yaml
diff --git a/cluster-scope/base/core/namespaces/openshift-storage/namespace.yaml b/cluster-scope/base/core/namespaces/openshift-storage/namespace.yaml
new file mode 100644
index 00000000..25809b2c
--- /dev/null
+++ b/cluster-scope/base/core/namespaces/openshift-storage/namespace.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: openshift-storage
+spec: {}
diff --git a/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-storage/kustomization.yaml b/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-storage/kustomization.yaml
new file mode 100644
index 00000000..53f3f198
--- /dev/null
+++ b/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-storage/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: openshift-storage
+resources:
+- operatorgroup.yaml
diff --git a/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-storage/operatorgroup.yaml b/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-storage/operatorgroup.yaml
new file mode 100644
index 00000000..244c20b0
--- /dev/null
+++ b/cluster-scope/base/operators.coreos.com/operatorgroups/openshift-storage/operatorgroup.yaml
@@ -0,0 +1,7 @@
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+  name: openshift-storage
+spec:
+  targetNamespaces:
+    - openshift-storage
diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/odf-operator/kustomization.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/odf-operator/kustomization.yaml
new file mode 100644
index 00000000..79d2efcf
--- /dev/null
+++ b/cluster-scope/base/operators.coreos.com/subscriptions/odf-operator/kustomization.yaml
@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: openshift-storage
+resources:
+- subscription.yaml
diff --git a/cluster-scope/base/operators.coreos.com/subscriptions/odf-operator/subscription.yaml b/cluster-scope/base/operators.coreos.com/subscriptions/odf-operator/subscription.yaml
new file mode 100644
index 00000000..677ed61f
--- /dev/null
+++ b/cluster-scope/base/operators.coreos.com/subscriptions/odf-operator/subscription.yaml
@@ -0,0 +1,10 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+    name: odf-operator
+spec:
+    channel: stable-4.10
+    installPlanApproval: Automatic
+    name: odf-operator
+    source: redhat-operators
+    sourceNamespace: openshift-marketplace
diff --git a/cluster-scope/bundles/odf/kustomization.yaml b/cluster-scope/bundles/odf/kustomization.yaml
new file mode 100644
index 00000000..97631c5f
--- /dev/null
+++ b/cluster-scope/bundles/odf/kustomization.yaml
@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base/core/namespaces/openshift-storage
+- ../../base/operators.coreos.com/operatorgroups/openshift-storage
+- ../../base/operators.coreos.com/subscriptions/odf-operator
diff --git a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml
index ba588e48..da044723 100644
--- a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml
+++ b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml
@@ -6,4 +6,5 @@ resources:
 - ../common
 - ../../bundles/openshift-gitops
 - ../../bundles/acm
+- ../../bundles/odf
 - clusterversion.yaml