Merge pull request #18 from larsks/feature/odf

Configure ODF for NESE storage

cluster-scope/base/core/configmaps/nerc-logo/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+    - configmap.yaml

cluster-scope/base/core/namespaces/openshift-storage/namespace.yaml

@@ -2,4 +2,6 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: openshift-storage
+  labels:
+    openshift.io/cluster-monitoring: "true"
 spec: {}

cluster-scope/base/ocs.openshift.io/ocsinitializations/ocsinit/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+    - ocsinitialization.yaml

cluster-scope/base/ocs.openshift.io/ocsinitializations/ocsinit/ocsinitialization.yaml

@@ -0,0 +1,7 @@
+apiVersion: ocs.openshift.io/v1
+kind: OCSInitialization
+metadata:
+  name: ocsinit
+  namespace: openshift-storage
+spec:
+  enableCephTools: true

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

cluster-scope/base/odf.openshift.io/storageclusters/ocs-external-storagecluster/storagecluster.yaml

@@ -0,0 +1,7 @@
+apiVersion: ocs.openshift.io/v1
+kind: StorageCluster
+metadata:
+  name: ocs-external-storagecluster
+spec:
+  externalStorage:
+    enable: true

cluster-scope/base/odf.openshift.io/storagesystems/ocs-external-storagecluster-storagesystem/kustomization.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: openshift-storage
+resources:
+  - storagesystem.yaml

cluster-scope/base/odf.openshift.io/storagesystems/ocs-external-storagecluster-storagesystem/storagesystem.yaml

@@ -0,0 +1,8 @@
+apiVersion: odf.openshift.io/v1alpha1
+kind: StorageSystem
+metadata:
+  name: ocs-external-storagecluster-storagesystem
+spec:
+  kind: storagecluster.ocs.openshift.io/v1
+  name: ocs-external-storagecluster
+  namespace: openshift-storage

cluster-scope/base/operator.openshift.io/consoles/cluster/console.yaml

@@ -0,0 +1,13 @@
+apiVersion: operator.openshift.io/v1
+kind: Console
+metadata:
+  name: cluster
+spec:
+  plugins:
+    - odf-console
+    - acm
+    - mce
+  customization:
+    customLogoFile:
+      name: nerc-logo
+      key: nerc-logo.png

cluster-scope/base/operator.openshift.io/consoles/cluster/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+    - console.yaml

cluster-scope/base/storage.k8s.io/storageclasses/ocs-external-storagecluster-ceph-rbd/kustomization.yaml

@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+    - storageclass.yaml

cluster-scope/base/storage.k8s.io/storageclasses/ocs-external-storagecluster-ceph-rbd/storageclass.yaml

@@ -0,0 +1,12 @@
+allowVolumeExpansion: true
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  annotations:
+    description: Provides RWO Filesystem volumes, and RWO and RWX Block volumes
+    storageclass.kubernetes.io/is-default-class: "true"
+  name: ocs-external-storagecluster-ceph-rbd
+parameters: {}
+provisioner: openshift-storage.rbd.csi.ceph.com
+reclaimPolicy: Delete
+volumeBindingMode: Immediate

cluster-scope/bundles/console/kustomization.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../../base/operator.openshift.io/consoles/cluster
+- ../../base/core/configmaps/nerc-logo

cluster-scope/bundles/odf-external/kustomization.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- ../odf
+- ../../base/odf.openshift.io/storagesystems/ocs-external-storagecluster-storagesystem
+- ../../base/odf.openshift.io/storageclusters/ocs-external-storagecluster
+- ../../base/storage.k8s.io/storageclasses/ocs-external-storagecluster-ceph-rbd

cluster-scope/bundles/odf/kustomization.yaml

@@ -4,3 +4,4 @@ resources:
 - ../../base/core/namespaces/openshift-storage
 - ../../base/operators.coreos.com/operatorgroups/openshift-storage
 - ../../base/operators.coreos.com/subscriptions/odf-operator
+- ../../base/ocs.openshift.io/ocsinitializations/ocsinit

cluster-scope/overlays/common/kustomization.yaml

@@ -9,3 +9,4 @@ resources:
 - ../../base/rbac.authorization.k8s.io/clusterrolebindings/self-provisioners
 - ../../bundles/cluster-admin-rbac/
 - ../../bundles/nmstate
+- ../../bundles/console

cluster-scope/overlays/nerc-ocp-infra/consoles.operator.openshift.io/cluster_patch.yaml

@@ -0,0 +1,7 @@
+apiVersion: operator.openshift.io/v1
+kind: Console
+metadata:
+  name: cluster
+spec:
+  customization:
+    customProductName: NERC OCP Infra Cluster

cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml

@@ -2,22 +2,23 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 commonLabels:
   nerc.mghpcc.org/kustomized: "true"
+
 resources:
 - ../common
 - ../../bundles/openshift-gitops
 - ../../bundles/acm
-- ../../bundles/odf
 - ../../base/operator.openshift.io/networks/cluster
+- ../../bundles/odf-external
 - clusterversion.yaml
 - machineconfigs/disable-net-ifnames.yaml
 - machineconfigs/mellanox-udev-rules
 - machineconfigs/configure-bond0
 - nodenetworkconfigurationpolicies/vlan-2177-nese.yaml
-
 - groupsyncs/github-ocp-on-nerc.yaml
 - clusterrolebindings/nerc-ops-cluster-reader.yaml
 - clusterrolebindings/nerc-ops-sudoers.yaml
 - clusterrolebindings/nerc-ops-portforward.yaml
 
 patches:
 - path: oauths/cluster_patch.yaml
+- path: consoles.operator.openshift.io/cluster_patch.yaml

fake-metrics-server/base/deploy.yaml

@@ -0,0 +1,13 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: fake-metrics-exporter
+spec:
+  template:
+    spec:
+      containers:
+        - name: fake-metrics-exporter
+          image: quay.io/larsks/fake-metrics-exporter:v0.1.0
+          ports:
+            - name: metrics
+              containerPort: 9283

fake-metrics-server/base/kustomization.yaml

@@ -0,0 +1,8 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: openshift-storage
+commonLabels:
+  app: fake-metrics-server
+resources:
+- deploy.yaml
+- service.yaml

fake-metrics-server/base/service.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: fake-metrics-exporter
+spec:
+  ports:
+  - port: 9283
+    targetPort: metrics

fake-metrics-server/overlays/nerc-ocp-infra/deploy_patch.yaml

@@ -0,0 +1,17 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: fake-metrics-exporter
+spec:
+  template:
+    spec:
+      volumes:
+        - name: fake-metrics
+          configMap:
+            name: fake-metrics
+      containers:
+        - name: fake-metrics-exporter
+          volumeMounts:
+            - name: fake-metrics
+              mountPath: /metrics.json
+              subPath: metrics.json

fake-metrics-server/overlays/nerc-ocp-infra/kustomization.yaml

@@ -0,0 +1,13 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+namespace: openshift-storage
+resources:
+- ../../base/
+
+patches:
+  - path: deploy_patch.yaml
+
+configMapGenerator:
+  - name: fake-metrics
+    files:
+      - metrics.json

fake-metrics-server/overlays/nerc-ocp-infra/metrics.json

@@ -0,0 +1,16 @@
+{
+  "ceph_health_status": 0.0,
+  "ceph_osd_flag_noup": 0.0,
+  "ceph_osd_flag_nodown": 0.0,
+  "ceph_osd_flag_noout": 0.0,
+  "ceph_osd_flag_noin": 0.0,
+  "ceph_osd_flag_nobackfill": 0.0,
+  "ceph_osd_flag_norebalance": 0.0,
+  "ceph_osd_flag_norecover": 0.0,
+  "ceph_osd_flag_noscrub": 0.0,
+  "ceph_osd_flag_nodeep_scrub": 0.0,
+  "ceph_num_objects_degraded": 0.0,
+  "ceph_num_objects_misplaced": 0.0,
+  "ceph_num_objects_unfound": 0.0,
+  "ceph_healthcheck_slow_ops": 0.0
+}