Enable Prom metrics without service monitor

Allows monitoring with alternate Prometheus collectors on EKS clusters that don't have Prometheus Operator/ServiceMonitor CRD
kubernetes-sigs · Dec 13, 2023 · bcbb386 · bcbb386
1 parent 64f624b
commit bcbb386
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/helm/aws-load-balancer-controller/README.md b/helm/aws-load-balancer-controller/README.md
@@ -255,11 +255,12 @@ The default values set by the application itself can be confirmed [here](https:/
 | `disableRestrictedSecurityGroupRules`          | If disabled, controller will not specify port range restriction in the backend security group rules                                                                                                                    | `false`                                           |
 | `objectSelector.matchExpressions`              | Webhook configuration to select specific pods by specifying the expression to be matched                                                                                                                               | None                                              |
 | `objectSelector.matchLabels`                   | Webhook configuration to select specific pods by specifying the key value label pair to be matched                                                                                                                     | None                                              |
+| `metrics.enabled`                              | Specifies whether the Prometheus metrics service should be created, independent of service monitor                                                                                                                     | `false`                                           |
 | `serviceMonitor.enabled`                       | Specifies whether a service monitor should be created, requires the ServiceMonitor CRD to be installed                                                                                                                 | `false`                                           |
 | `serviceMonitor.additionalLabels`              | Labels to add to the service account                                                                                                                                                                                   | `{}`                                              |
 | `serviceMonitor.interval`                      | Prometheus scrape interval                                                                                                                                                                                             | `1m`                                              |
 | `serviceMonitor.namespace`                     | Namespace in which Prometheus is running                                                                                                                                                                               | None                                              |
 | `clusterSecretsPermissions.allowAllSecrets`    | If `true`, controller has access to all secrets in the cluster.                                                                                                                                                        | `false`                                           |
 | `controllerConfig.featureGates`                | set of `key: value` pairs that describe AWS load balance controller features                                                                                                                                           | `{}`                                              |
 | `ingressClassConfig.default`                   | If `true`, the ingressclass will be the default class of the cluster.                                                                                                                                                  | `false`                                           |
-| `enableServiceMutatorWebhook`                 | If `false`, disable the Service Mutator webhook which makes all new services of type LoadBalancer reconciled by the lb controller                                                                                                                                              | `true`                                           |
+| `enableServiceMutatorWebhook`                  | If `false`, disable the Service Mutator webhook which makes all new services of type LoadBalancer reconciled by the lb controller                                                                                      | `true`                                            |
diff --git a/helm/aws-load-balancer-controller/templates/service.yaml b/helm/aws-load-balancer-controller/templates/service.yaml
@@ -1,4 +1,4 @@
-{{- if.Values.serviceMonitor.enabled }}
+{{- if or .Values.serviceMonitor.enabled .Values.metrics.enabled }}
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/helm/aws-load-balancer-controller/values.yaml b/helm/aws-load-balancer-controller/values.yaml
@@ -336,6 +336,10 @@ objectSelector:
   matchLabels:
   #   key: value
 
+metrics:
+  # Specifies whether the Prometheus metrics service should be created, independent of service monitor
+  enabled: false
+
 serviceMonitor:
   # Specifies whether a service monitor should be created
   enabled: false