diff --git a/config/resources-metrics/kustomization.yaml b/config/resources-metrics/kustomization.yaml index a7e14d31..fdd61c5c 100644 --- a/config/resources-metrics/kustomization.yaml +++ b/config/resources-metrics/kustomization.yaml @@ -5,3 +5,9 @@ components: - iam/ - identity/ - resources-manager/ + # ResourceMetricsPolicy resources for each service. These are owned exclusively + # by the milo-resource-metrics Kustomization and must not be included in any + # other path (e.g. crd/overlays/core-control-plane via the services component). + - ../services/iam/telemetry/metrics + - ../services/quota/telemetry/metrics + - ../services/resourcemanager/telemetry/metrics diff --git a/config/services/iam/kustomization.yaml b/config/services/iam/kustomization.yaml index 9adf7683..46e5538c 100644 --- a/config/services/iam/kustomization.yaml +++ b/config/services/iam/kustomization.yaml @@ -1,5 +1,2 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component - -components: - - telemetry/metrics diff --git a/config/services/kustomization.yaml b/config/services/kustomization.yaml index 6eead7b0..fb0c4b2c 100644 --- a/config/services/kustomization.yaml +++ b/config/services/kustomization.yaml @@ -5,10 +5,13 @@ kind: Component # Add new service directories here as they are created. components: - - iam - - resourcemanager - quota # identity is intentionally excluded here — it contains ActivityPolicy resources # which require the activity.miloapis.com CRDs to be installed. Those CRDs are # provided by the activity service, which is not deployed in the milo test cluster. # Deploy config/services/identity/ separately once the activity service is present. + # + # iam and resourcemanager are intentionally excluded here — their only content was + # ResourceMetricsPolicy resources, which are now owned exclusively by the + # resources-metrics component. Including them here would create Flux ownership + # conflicts with the milo-resource-metrics Kustomization. diff --git a/config/services/quota/kustomization.yaml b/config/services/quota/kustomization.yaml index d75acc7f..74f1c9fc 100644 --- a/config/services/quota/kustomization.yaml +++ b/config/services/quota/kustomization.yaml @@ -3,6 +3,5 @@ kind: Component components: - iam - - telemetry/metrics - registrations - claim-policies diff --git a/config/services/resourcemanager/kustomization.yaml b/config/services/resourcemanager/kustomization.yaml index 9adf7683..46e5538c 100644 --- a/config/services/resourcemanager/kustomization.yaml +++ b/config/services/resourcemanager/kustomization.yaml @@ -1,5 +1,2 @@ apiVersion: kustomize.config.k8s.io/v1alpha1 kind: Component - -components: - - telemetry/metrics