diff --git a/day-two.md b/day-two.md index 6d5f6b5..e5667ea 100644 --- a/day-two.md +++ b/day-two.md @@ -39,7 +39,6 @@ Two quick options to configure the Image Registry operator are provided below to Refer to these instructions to configure additional operators * [Local storage operator] * [Prometheus operator with persistent storage] -* [Metering operator] * [3scale operator] ### 3. Configure image pruning @@ -104,7 +103,6 @@ Kevin Chung [configure ephemeral storage]: https://docs.openshift.com/container-platform/latest/registry/configuring_registry_storage/configuring-registry-storage-baremetal.html#installation-registry-storage-non-production_configuring-registry-storage-baremetal [Local storage operator]: ./operator/local-storage/ [Prometheus operator with persistent storage]: ./operator/metrics/ -[Metering operator]: ./operator/metering/ [3scale operator]: ./operator/3scale/ [automatically pruning images]: https://docs.openshift.com/container-platform/latest/applications/pruning-objects.html#pruning-images_pruning-objects [Chrony time service]: ./machineconfig/chrony/ diff --git a/operator/metering/README.md b/operator/metering/README.md deleted file mode 100644 index c9a51a6..0000000 --- a/operator/metering/README.md +++ /dev/null @@ -1,46 +0,0 @@ -# Configure NFS storage for metering operator - -Refer to the following for additional documentation to [install the metering operator]. - -This section provides steps to configure the metering operator to use NFS storage for a lab environment. NFS storage for the metering operator is not recommended in production. - -### 1. Configure NFS mountpoint - -Set up a metering and a hive mountpoint on the NFS host. Update the reference to *.yourcluster.domain.com to your own -``` -mkdir -p /exports/metering/metering-data -chmod -R 777 /exports/metering/metering-data -chown -R nfsnobody:nfsnobody /exports/metering/metering-data - -mkdir -p /exports/metering/hive-metastore -chmod -R 777 /exports/metering/hive-metastore -chown -R nfsnobody:nfsnobody /exports/metering/hive-metastore -echo "/exports/metering *.yourcluster.domain.com(rw,sync,no_wdelay,root_squash,insecure)" >> /etc/exports -exportfs -rv -``` - -### 2. Configure NFS storage - -From the oc cli, create two persistent volumes of 5Gi each. Use the sample `metering-volume.pv.yaml` and `hive-metastore-db-data.pv.yaml` and update the reference to the NFS server to your own -``` -oc apply -f metering-volume.pv.yaml -oc apply -f hive-metastore-db-data.pv.yaml -``` - -### 3. Configure metering - -Follow the steps from the documentation to [configure metering with storage]. Use the sample `operator-metering.meteringconfig.yaml` and update the configuration as needed -``` -oc apply -f operator-metering.meteringconfig.yaml -``` - -### 4. Use Metering - -Deploy the example metering report with `oc apply -f cluster-cpu-capacity-hourly.report.yaml` - -Following the remaining documentation to [view your report data] - - -[install the metering operator]: https://docs.openshift.com/container-platform/latest/metering/metering-installing-metering.html -[configure metering with storage]: https://docs.openshift.com/container-platform/latest/metering/configuring_metering/metering-configure-persistent-storage.html#metering-store-data-in-shared-volumes_metering-configure-persistent-storage -[view your report data]: https://docs.openshift.com/container-platform/latest/metering/metering-using-metering.html#metering-viewing-report-results_using-metering diff --git a/operator/metering/cluster-cpu-capacity-hourly.report.yaml b/operator/metering/cluster-cpu-capacity-hourly.report.yaml deleted file mode 100644 index 1c5973b..0000000 --- a/operator/metering/cluster-cpu-capacity-hourly.report.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: metering.openshift.io/v1 -kind: Report -metadata: - name: cluster-cpu-capacity-hourly -spec: - query: "cluster-cpu-capacity" - schedule: - period: "hourly" diff --git a/operator/metering/hive-metastore-db-data.pv.yaml b/operator/metering/hive-metastore-db-data.pv.yaml deleted file mode 100644 index 5af2200..0000000 --- a/operator/metering/hive-metastore-db-data.pv.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: hive-metastore-db-volume -spec: - accessModes: - - ReadWriteOnce - capacity: - storage: 5Gi - nfs: - path: /exports/metering/hive-metastore - server: 1.2.3.4 - persistentVolumeReclaimPolicy: Retain diff --git a/operator/metering/metering-volume.pv.yaml b/operator/metering/metering-volume.pv.yaml deleted file mode 100644 index aa0ef71..0000000 --- a/operator/metering/metering-volume.pv.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: metering-volume -spec: - accessModes: - - ReadWriteMany - capacity: - storage: 5Gi - nfs: - path: /exports/metering/metering-data - server: 1.2.3.4 - persistentVolumeReclaimPolicy: Retain diff --git a/operator/metering/operator-metering.meteringconfig.yaml b/operator/metering/operator-metering.meteringconfig.yaml deleted file mode 100644 index 0404c51..0000000 --- a/operator/metering/operator-metering.meteringconfig.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: metering.openshift.io/v1 -kind: MeteringConfig -metadata: - name: operator-metering - namespace: openshift-metering -spec: - storage: - type: hive - hive: - type: sharedPVC - sharedPVC: - claimName: metering-claim - createPVC: true - size: 5Gi