Merge helm-flag-restructure (aws-observability#332) into helm-annotation-scraper-routing

Propagates the needsCR least-privilege fix (require targetAllocator.enabled).

Author: wenegiemepraise

charts/amazon-cloudwatch-observability/templates/target-allocator-clusterrole.yaml

@@ -12,7 +12,7 @@
 {{- if or (and (hasKey ($customAgent.prometheus) "targetAllocator") (hasKey ($customAgent.prometheus.targetAllocator) "enabled") $customAgent.prometheus.targetAllocator.enabled) $otelCIScrape }}
 {{- $needsTA = true }}
 {{- end }}
-{{- if or (and (hasKey ($customAgent.prometheus) "targetAllocator") (hasKey ($customAgent.prometheus.targetAllocator) "prometheusCR") $customAgent.prometheus.targetAllocator.prometheusCR.enabled) $otelCIScrape }}
+{{- if or (and (hasKey ($customAgent.prometheus) "targetAllocator") (hasKey ($customAgent.prometheus.targetAllocator) "enabled") $customAgent.prometheus.targetAllocator.enabled (hasKey ($customAgent.prometheus.targetAllocator) "prometheusCR") $customAgent.prometheus.targetAllocator.prometheusCR.enabled) $otelCIScrape }}
 {{- $needsCR = true }}
 {{- end }}
 {{- end }}