moving OBC to odf-internal

OBC (ObjectBucketClaim) is a CR managed by ODF. So,
unless we have installed ODF, the Manifest will
never work.

This makes Observability Policy to depend on
existing CM and Secret with the S3 info. If you
have ODF these are created by the OBC, if not
the user needs to provide them.

Otherwise we are making ACM dependent on ODF. Now,
ACM depends on a CM/Secret.

Author: jgato

telco-hub/configuration/reference-crs-kube-compare/metadata.yaml

@@ -55,6 +55,7 @@ parts:
           - path: optional/odf-internal/odfNS.yaml
           - path: optional/odf-internal/odfOperatorGroup.yaml
           - path: optional/odf-internal/odfSubscription.yaml
+          - path: optional/odf-internal/observabilityOBC.yaml
           - path: optional/odf-internal/storageCluster.yaml
             config:
               ignore-unspecified-fields: true
@@ -85,7 +86,6 @@ parts:
             config:
               ignore-unspecified-fields: true
           - path: required/acm/observabilityNS.yaml
-          - path: required/acm/observabilityOBC.yaml
             config:
               ignore-unspecified-fields: true
           - path: required/acm/observabilityMCSB.yaml

…mpare/required/acm/observabilityOBC.yaml …ional/odf-internal/observabilityOBC.yamltelco-hub/configuration/reference-crs-kube-compare/required/acm/observabilityOBC.yaml renamed to telco-hub/configuration/reference-crs-kube-compare/optional/odf-internal/observabilityOBC.yaml telco-hub/configuration/reference-crs-kube-compare/required/acm/observabilityOBC.yaml renamed to telco-hub/configuration/reference-crs-kube-compare/optional/odf-internal/observabilityOBC.yaml

@@ -2,7 +2,7 @@
 apiVersion: objectbucket.io/v1alpha1
 kind: ObjectBucketClaim
 metadata:
-  name: observability-obc
+  name: observability-ob
   annotations:
     argocd.argoproj.io/sync-wave: "-10"
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true

telco-hub/configuration/reference-crs/optional/odf-internal/kustomization.yaml

@@ -7,3 +7,4 @@ resources:
   - odfSubscription.yaml
   - storageCluster.yaml
   - odfReady.yaml
+  - observabilityOBC.yaml

…e-crs/required/acm/observabilityOBC.yaml …ional/odf-internal/observabilityOBC.yamltelco-hub/configuration/reference-crs/required/acm/observabilityOBC.yaml renamed to telco-hub/configuration/reference-crs/optional/odf-internal/observabilityOBC.yaml telco-hub/configuration/reference-crs/required/acm/observabilityOBC.yaml renamed to telco-hub/configuration/reference-crs/optional/odf-internal/observabilityOBC.yaml

@@ -2,7 +2,7 @@
 apiVersion: objectbucket.io/v1alpha1
 kind: ObjectBucketClaim
 metadata:
-  name: observability-obc
+  name: observability-ob
   annotations:
     argocd.argoproj.io/sync-wave: "-10"
     argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true

telco-hub/configuration/reference-crs/required/acm/kustomization.yaml

@@ -12,7 +12,6 @@ resources:
   - acmPerfSearch.yaml
   - acmProvisioning.yaml
   - observabilityNS.yaml
-  - observabilityOBC.yaml
   - observabilityRoutePolicy.yaml
   - observabilityRoutePlacement.yaml
   - observabilityRoutePlacementBinding.yaml

telco-hub/configuration/reference-crs/required/acm/thanosSecretPolicy.yaml

@@ -27,8 +27,8 @@ spec:
         severity: high
         object-templates-raw: |
           {{- /* read the bucket data and noobaa endpoint access data */ -}}
-          {{- $objBucket := (lookup "v1" "ConfigMap" "open-cluster-management-observability" "observability-obc") }}
-          {{- $awsAccess := (lookup "v1" "Secret" "open-cluster-management-observability" "observability-obc") }}
+          {{- $objBucket := (lookup "v1" "ConfigMap" "open-cluster-management-observability" "observability-object-bucket") }}
+          {{- $awsAccess := (lookup "v1" "Secret" "open-cluster-management-observability" "observability-object-bucket") }}
           {{- /* create the thanos config file as a template */ -}}
           {{- $thanosConfig := `
           type: s3