From 6bbc817bd1db22b149a633d55ae8b7cd8437cbd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=8B/Thor=28sten=29=3F/=20Schwesig?= <89909507+schwesig@users.noreply.github.com> Date: Mon, 23 Sep 2024 10:39:41 -0400 Subject: [PATCH] Add ACM metrics 2ti object bucket claim & storage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes partly https://github.com/nerc-project/operations/issues/745 This PR tackles part of the issue by adding acm-metrics-2ti and updating existing observability and storage settings. The changes try to solve or reproduce the errors in #745. But this is only the first step, see #745. Signed-off-by: ​/Thor(sten)?/ Schwesig <89909507+schwesig@users.noreply.github.com> --- .../acm-metrics-2ti/kustomization.yaml | 4 ++++ .../acm-metrics-2ti/objectbucketclaim.yaml | 8 ++++++++ .../bundles/acm-observability/kustomization.yaml | 1 + .../acm-metrics-2ti-storage/backingstore.yaml | 13 +++++++++++++ .../acm-metrics-2ti-storage/bucketclass.yaml | 10 ++++++++++ .../acm-metrics-2ti-storage/kustomization.yaml | 8 ++++++++ .../acm-metrics-2ti-storage/storageclass.yaml | 11 +++++++++++ .../overlays/nerc-ocp-infra/kustomization.yaml | 2 +- 8 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics-2ti/kustomization.yaml create mode 100644 cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics-2ti/objectbucketclaim.yaml create mode 100644 cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/backingstore.yaml create mode 100644 cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/bucketclass.yaml create mode 100644 cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/kustomization.yaml create mode 100644 cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/storageclass.yaml diff --git a/cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics-2ti/kustomization.yaml b/cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics-2ti/kustomization.yaml new file mode 100644 index 00000000..982e0056 --- /dev/null +++ b/cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics-2ti/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - objectbucketclaim.yaml diff --git a/cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics-2ti/objectbucketclaim.yaml b/cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics-2ti/objectbucketclaim.yaml new file mode 100644 index 00000000..9b2f14cb --- /dev/null +++ b/cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics-2ti/objectbucketclaim.yaml @@ -0,0 +1,8 @@ +apiVersion: objectbucket.io/v1alpha1 +kind: ObjectBucketClaim +metadata: + name: acm-metrics-2ti + namespace: open-cluster-management-observability +spec: + generateBucketName: acm-metrics-2ti + storageClassName: acm-metrics-2ti-bucket-storage diff --git a/cluster-scope/bundles/acm-observability/kustomization.yaml b/cluster-scope/bundles/acm-observability/kustomization.yaml index 78f3e1f0..b99e2709 100644 --- a/cluster-scope/bundles/acm-observability/kustomization.yaml +++ b/cluster-scope/bundles/acm-observability/kustomization.yaml @@ -4,6 +4,7 @@ resources: - ../../base/core/namespaces/open-cluster-management-observability - ../../base/objectbucket.io/objectbucketclaims/observability - ../../base/objectbucket.io/objectbucketclaims/acm-metrics + - ../../base/objectbucket.io/objectbucketclaims/acm-metrics-2ti - ../../base/external-secrets.io/externalsecrets/open-cluster-management-observability-acm-metrics-object-storage - ../../base/external-secrets.io/externalsecrets/open-cluster-management-observability-thanos-object-storage - ../../base/external-secrets.io/externalsecrets/open-cluster-management-observability-multiclusterhub-operator-pull-secret diff --git a/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/backingstore.yaml b/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/backingstore.yaml new file mode 100644 index 00000000..0f7ab544 --- /dev/null +++ b/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/backingstore.yaml @@ -0,0 +1,13 @@ +apiVersion: noobaa.io/v1alpha1 +kind: BackingStore +metadata: + name: acm-metrics-backing-store + namespace: openshift-storage +spec: + pvPool: + numVolumes: 2 + resources: + requests: + storage: 1Ti + storageClass: ocs-external-storagecluster-ceph-rbd + type: pv-pool diff --git a/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/bucketclass.yaml b/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/bucketclass.yaml new file mode 100644 index 00000000..073e456d --- /dev/null +++ b/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/bucketclass.yaml @@ -0,0 +1,10 @@ +apiVersion: noobaa.io/v1alpha1 +kind: BucketClass +metadata: + name: acm-metrics-2ti-bucket-class + namespace: openshift-storage +spec: + placementPolicy: + tiers: + - backingStores: + - acm-metrics-2ti-backing-store diff --git a/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/kustomization.yaml new file mode 100644 index 00000000..43e1cb93 --- /dev/null +++ b/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +commonLabels: + app: noobaa +resources: +- backingstore.yaml +- bucketclass.yaml +- storageclass.yaml diff --git a/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/storageclass.yaml b/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/storageclass.yaml new file mode 100644 index 00000000..0634a3be --- /dev/null +++ b/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-2ti-storage/storageclass.yaml @@ -0,0 +1,11 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + annotations: + description: Provides Object Bucket Claims (OBCs) for ACM metrics + name: acm-metrics-2ti-bucket-storage +parameters: + bucketclass: acm-metrics-2ti-bucket-class +provisioner: openshift-storage.noobaa.io/obc +reclaimPolicy: Delete +volumeBindingMode: Immediate diff --git a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml index 7a9e1edb..aba9a9c9 100644 --- a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml +++ b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml @@ -32,7 +32,7 @@ resources: - persistentvolumeclaims - nerc-logs-metrics-open-cluster-management-cluster-manager-admin.yaml - acm-metrics-storage - +- acm-metrics-2ti-storage components: - ../../components/nerc-oauth-github