diff --git a/cluster-scope/base/external-secrets.io/externalsecrets/open-cluster-management-observability-acm-metrics-object-storage/externalsecret.yaml b/cluster-scope/base/external-secrets.io/externalsecrets/open-cluster-management-observability-acm-metrics-object-storage/externalsecret.yaml deleted file mode 100644 index 50d6112e..00000000 --- a/cluster-scope/base/external-secrets.io/externalsecrets/open-cluster-management-observability-acm-metrics-object-storage/externalsecret.yaml +++ /dev/null @@ -1,44 +0,0 @@ -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: open-cluster-management-observability-acm-metrics-object-storage - namespace: open-cluster-management-observability -spec: - refreshInterval: 15s - secretStoreRef: - name: nerc-cluster-secrets - kind: ClusterSecretStore - target: - name: acm-metrics-object-storage - template: - type: Opaque - engineVersion: v2 - data: - acm-metrics.yaml: | - type: s3 - config: - bucket: "{{ .bucket }}" - endpoint: "{{ .endpoint }}" - insecure: false - access_key: "{{ .access_key }}" - secret_key: "{{ .secret_key }}" - http_config: - tls_config: - ca_file: "/run/secrets/kubernetes.io/serviceaccount/service-ca.crt" - data: - - secretKey: bucket - remoteRef: - key: $ENV/$CLUSTER/open-cluster-management-observability/acm-metrics/object-storage # the path-details will be replaced in the overlay patch - property: bucket - - secretKey: endpoint - remoteRef: - key: $ENV/$CLUSTER/open-cluster-management-observability/acm-metrics/object-storage - property: endpoint - - secretKey: access_key - remoteRef: - key: $ENV/$CLUSTER/open-cluster-management-observability/acm-metrics/object-storage - property: access_key - - secretKey: secret_key - remoteRef: - key: $ENV/$CLUSTER/open-cluster-management-observability/acm-metrics/object-storage - property: secret_key diff --git a/cluster-scope/base/external-secrets.io/externalsecrets/open-cluster-management-observability-acm-metrics-object-storage/kustomization.yaml b/cluster-scope/base/external-secrets.io/externalsecrets/open-cluster-management-observability-acm-metrics-object-storage/kustomization.yaml deleted file mode 100644 index 19ca433e..00000000 --- a/cluster-scope/base/external-secrets.io/externalsecrets/open-cluster-management-observability-acm-metrics-object-storage/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -commonLabels: - nerc.mghpcc.org/kustomized: "true" - -resources: - - externalsecret.yaml diff --git a/cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics/kustomization.yaml b/cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics/kustomization.yaml deleted file mode 100644 index 982e0056..00000000 --- a/cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - objectbucketclaim.yaml diff --git a/cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics/objectbucketclaim.yaml b/cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics/objectbucketclaim.yaml deleted file mode 100644 index 8bf1ea69..00000000 --- a/cluster-scope/base/objectbucket.io/objectbucketclaims/acm-metrics/objectbucketclaim.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: objectbucket.io/v1alpha1 -kind: ObjectBucketClaim -metadata: - name: acm-metrics - namespace: open-cluster-management-observability -spec: - generateBucketName: acm-metrics - storageClassName: acm-metrics-bucket-storage diff --git a/cluster-scope/bundles/acm-observability/kustomization.yaml b/cluster-scope/bundles/acm-observability/kustomization.yaml index 3c7071da..7edb527f 100644 --- a/cluster-scope/bundles/acm-observability/kustomization.yaml +++ b/cluster-scope/bundles/acm-observability/kustomization.yaml @@ -3,9 +3,7 @@ kind: Kustomization 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-acm-metrics-2ti-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-storage/backingstore.yaml b/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-storage/backingstore.yaml deleted file mode 100644 index 0f7ab544..00000000 --- a/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-storage/backingstore.yaml +++ /dev/null @@ -1,13 +0,0 @@ -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-storage/bucketclass.yaml b/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-storage/bucketclass.yaml deleted file mode 100644 index 078990e3..00000000 --- a/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-storage/bucketclass.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: noobaa.io/v1alpha1 -kind: BucketClass -metadata: - name: acm-metrics-bucket-class - namespace: openshift-storage -spec: - placementPolicy: - tiers: - - backingStores: - - acm-metrics-backing-store diff --git a/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-storage/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-storage/kustomization.yaml deleted file mode 100644 index 43e1cb93..00000000 --- a/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-storage/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ -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-storage/storageclass.yaml b/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-storage/storageclass.yaml deleted file mode 100644 index a287c699..00000000 --- a/cluster-scope/overlays/nerc-ocp-infra/acm-metrics-storage/storageclass.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - annotations: - description: Provides Object Bucket Claims (OBCs) for ACM metrics - name: acm-metrics-bucket-storage -parameters: - bucketclass: acm-metrics-bucket-class -provisioner: openshift-storage.noobaa.io/obc -reclaimPolicy: Delete -volumeBindingMode: Immediate diff --git a/cluster-scope/overlays/nerc-ocp-infra/externalsecrets/open-cluster-management-observability-acm-metrics-object-storage_patch.yaml b/cluster-scope/overlays/nerc-ocp-infra/externalsecrets/open-cluster-management-observability-acm-metrics-object-storage_patch.yaml deleted file mode 100644 index 672b0bf6..00000000 --- a/cluster-scope/overlays/nerc-ocp-infra/externalsecrets/open-cluster-management-observability-acm-metrics-object-storage_patch.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: open-cluster-management-observability-acm-metrics-object-storage - namespace: open-cluster-management-observability -spec: - data: - - secretKey: bucket - remoteRef: - key: nerc/nerc-ocp-infra/open-cluster-management-observability/acm-metrics/object-storage - property: bucket - - secretKey: endpoint - remoteRef: - key: nerc/nerc-ocp-infra/open-cluster-management-observability/acm-metrics/object-storage - property: endpoint - - secretKey: access_key - remoteRef: - key: nerc/nerc-ocp-infra/open-cluster-management-observability/acm-metrics/object-storage - property: access_key - - secretKey: secret_key - remoteRef: - key: nerc/nerc-ocp-infra/open-cluster-management-observability/acm-metrics/object-storage - property: secret_key diff --git a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml index f783f588..046590a4 100644 --- a/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml +++ b/cluster-scope/overlays/nerc-ocp-infra/kustomization.yaml @@ -31,7 +31,6 @@ resources: - grafana-dashboards - persistentvolumeclaims - nerc-logs-metrics-open-cluster-management-cluster-manager-admin.yaml -- acm-metrics-storage - acm-metrics-2ti-storage components: - ../../components/nerc-oauth-github @@ -58,7 +57,6 @@ patches: - path: clustersecretstores/nerc-cluster-secrets_patch.yaml - path: machineconfigs/hostpath-provisioner-selinux_patch.yaml - path: externalsecrets/open-cluster-management-observability-multiclusterhub-operator-pull-secret_patch.yaml -- path: externalsecrets/open-cluster-management-observability-acm-metrics-object-storage_patch.yaml - path: externalsecrets/open-cluster-management-observability-acm-metrics-2ti-object-storage_patch.yaml - path: externalsecrets/open-cluster-management-observability-thanos-object-storage_patch.yaml - patch: |