diff --git a/telco-hub/configuration/reference-crs-kube-compare/metadata.yaml b/telco-hub/configuration/reference-crs-kube-compare/metadata.yaml index 9703db79c..640390d60 100644 --- a/telco-hub/configuration/reference-crs-kube-compare/metadata.yaml +++ b/telco-hub/configuration/reference-crs-kube-compare/metadata.yaml @@ -88,11 +88,13 @@ parts: - path: required/acm/observabilityOBC.yaml config: ignore-unspecified-fields: true + - path: required/acm/observabilityMCSB.yaml + - path: required/acm/observabilityRoutePlacement.yaml + - path: required/acm/observabilityRoutePlacementBinding.yaml - path: required/acm/observabilitySecret.yaml - path: required/acm/pullSecretPolicy.yaml - path: required/acm/pullSecretPlacement.yaml - path: required/acm/pullSecretPlacementBinding.yaml - - path: required/acm/pullSecretMCSB.yaml - path: required/acm/thanosSecretPolicy.yaml config: ignore-unspecified-fields: true diff --git a/telco-hub/configuration/reference-crs-kube-compare/required/acm/pullSecretMCSB.yaml b/telco-hub/configuration/reference-crs-kube-compare/required/acm/observabilityMCSB.yaml similarity index 100% rename from telco-hub/configuration/reference-crs-kube-compare/required/acm/pullSecretMCSB.yaml rename to telco-hub/configuration/reference-crs-kube-compare/required/acm/observabilityMCSB.yaml diff --git a/telco-hub/configuration/reference-crs-kube-compare/required/acm/observabilityRoutePlacement.yaml b/telco-hub/configuration/reference-crs-kube-compare/required/acm/observabilityRoutePlacement.yaml new file mode 100644 index 000000000..21e08ec93 --- /dev/null +++ b/telco-hub/configuration/reference-crs-kube-compare/required/acm/observabilityRoutePlacement.yaml @@ -0,0 +1,23 @@ +--- +apiVersion: cluster.open-cluster-management.io/v1beta1 +kind: Placement +metadata: + name: obs-route-policy-placement + namespace: open-cluster-management-observability + annotations: + argocd.argoproj.io/sync-wave: "-25" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + predicates: + - requiredClusterSelector: + labelSelector: + matchExpressions: + - key: local-cluster + operator: In + values: + - "true" + tolerations: + - key: cluster.open-cluster-management.io/unavailable + operator: Exists + - key: cluster.open-cluster-management.io/unreachable + operator: Exists \ No newline at end of file diff --git a/telco-hub/configuration/reference-crs-kube-compare/required/acm/observabilityRoutePlacementBinding.yaml b/telco-hub/configuration/reference-crs-kube-compare/required/acm/observabilityRoutePlacementBinding.yaml new file mode 100644 index 000000000..51de9598d --- /dev/null +++ b/telco-hub/configuration/reference-crs-kube-compare/required/acm/observabilityRoutePlacementBinding.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: policy.open-cluster-management.io/v1 +kind: PlacementBinding +metadata: + name: obs-route-policy-placementbinding + namespace: open-cluster-management-observability + annotations: + argocd.argoproj.io/sync-wave: "-25" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +placementRef: + name: obs-route-policy-placement + kind: Placement + apiGroup: cluster.open-cluster-management.io +subjects: + - name: obs-route-policy + kind: Policy + apiGroup: policy.open-cluster-management.io \ No newline at end of file diff --git a/telco-hub/configuration/reference-crs/required/acm/kustomization.yaml b/telco-hub/configuration/reference-crs/required/acm/kustomization.yaml index c79cd6e7d..76b857751 100644 --- a/telco-hub/configuration/reference-crs/required/acm/kustomization.yaml +++ b/telco-hub/configuration/reference-crs/required/acm/kustomization.yaml @@ -13,6 +13,9 @@ resources: - acmProvisioning.yaml - observabilityNS.yaml - observabilityOBC.yaml + - observabilityRoutePolicy.yaml + - observabilityRoutePlacement.yaml + - observabilityRoutePlacementBinding.yaml - thanosSecretPolicy.yaml - thanosSecretPlacement.yaml - thanosSecretPlacementBinding.yaml @@ -20,6 +23,6 @@ resources: - pullSecretPolicy.yaml - pullSecretPlacement.yaml - pullSecretPlacementBinding.yaml - - pullSecretMCSB.yaml + - observabilityMCSB.yaml - observabilityMCO.yaml diff --git a/telco-hub/configuration/reference-crs/required/acm/pullSecretMCSB.yaml b/telco-hub/configuration/reference-crs/required/acm/observabilityMCSB.yaml similarity index 100% rename from telco-hub/configuration/reference-crs/required/acm/pullSecretMCSB.yaml rename to telco-hub/configuration/reference-crs/required/acm/observabilityMCSB.yaml diff --git a/telco-hub/configuration/reference-crs/required/acm/observabilityRoutePlacement.yaml b/telco-hub/configuration/reference-crs/required/acm/observabilityRoutePlacement.yaml new file mode 100644 index 000000000..763c0a3d9 --- /dev/null +++ b/telco-hub/configuration/reference-crs/required/acm/observabilityRoutePlacement.yaml @@ -0,0 +1,23 @@ +--- +apiVersion: cluster.open-cluster-management.io/v1beta1 +kind: Placement +metadata: + name: obs-route-policy-placement + namespace: open-cluster-management-observability + annotations: + argocd.argoproj.io/sync-wave: "-25" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +spec: + predicates: + - requiredClusterSelector: + labelSelector: + matchExpressions: + - key: local-cluster + operator: In + values: + - "true" + tolerations: + - key: cluster.open-cluster-management.io/unavailable + operator: Exists + - key: cluster.open-cluster-management.io/unreachable + operator: Exists diff --git a/telco-hub/configuration/reference-crs/required/acm/observabilityRoutePlacementBinding.yaml b/telco-hub/configuration/reference-crs/required/acm/observabilityRoutePlacementBinding.yaml new file mode 100644 index 000000000..9aeed94e6 --- /dev/null +++ b/telco-hub/configuration/reference-crs/required/acm/observabilityRoutePlacementBinding.yaml @@ -0,0 +1,17 @@ +--- +apiVersion: policy.open-cluster-management.io/v1 +kind: PlacementBinding +metadata: + name: obs-route-policy-placementbinding + namespace: open-cluster-management-observability + annotations: + argocd.argoproj.io/sync-wave: "-25" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true +placementRef: + name: obs-route-policy-placement + kind: Placement + apiGroup: cluster.open-cluster-management.io +subjects: + - name: obs-route-policy + kind: Policy + apiGroup: policy.open-cluster-management.io diff --git a/telco-hub/configuration/reference-crs/required/acm/observabilityRoutePolicy.yaml b/telco-hub/configuration/reference-crs/required/acm/observabilityRoutePolicy.yaml index 60ffc648c..c14a62b17 100644 --- a/telco-hub/configuration/reference-crs/required/acm/observabilityRoutePolicy.yaml +++ b/telco-hub/configuration/reference-crs/required/acm/observabilityRoutePolicy.yaml @@ -6,6 +6,8 @@ metadata: policy.open-cluster-management.io/categories: CM Configuration Management policy.open-cluster-management.io/controls: CM-2 Baseline Configuration policy.open-cluster-management.io/standards: NIST SP 800-53 + argocd.argoproj.io/sync-wave: "-25" + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true ran.openshift.io/ztp-deploy-wave: "1" name: obs-route-policy namespace: open-cluster-management-observability @@ -41,45 +43,3 @@ spec: acm-alertmanager-route: '{{ (lookup "route.openshift.io/v1" "Route" "open-cluster-management-observability" "alertmanager").spec.host }}' acm-hub-cluster-id: '{{ $hubID }}' {{- end }} ---- -apiVersion: cluster.open-cluster-management.io/v1beta1 -kind: Placement -metadata: - name: obs-route-policy-placement - namespace: open-cluster-management-observability -spec: - predicates: - - requiredClusterSelector: - labelSelector: - matchExpressions: - - key: local-cluster - operator: In - values: - - "true" - tolerations: - - key: cluster.open-cluster-management.io/unavailable - operator: Exists - - key: cluster.open-cluster-management.io/unreachable - operator: Exists ---- -apiVersion: policy.open-cluster-management.io/v1 -kind: PlacementBinding -metadata: - name: obs-route-policy-placementbinding - namespace: open-cluster-management-observability -placementRef: - name: obs-route-policy-placement - kind: Placement - apiGroup: cluster.open-cluster-management.io -subjects: - - name: obs-route-policy - kind: Policy - apiGroup: policy.open-cluster-management.io ---- -apiVersion: cluster.open-cluster-management.io/v1beta2 -kind: ManagedClusterSetBinding -metadata: - name: default - namespace: open-cluster-management-observability -spec: - clusterSet: default