diff --git a/helm/aws-load-balancer-controller/README.md b/helm/aws-load-balancer-controller/README.md index 6da919857e..1f4eddc120 100644 --- a/helm/aws-load-balancer-controller/README.md +++ b/helm/aws-load-balancer-controller/README.md @@ -267,6 +267,7 @@ 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.namespace` | Namespace in which to create the service monitor | None | | `serviceMonitor.additionalLabels` | Labels to add to the service monitor | `{}` | @@ -285,4 +286,4 @@ The default values set by the application itself can be confirmed [here](https:/ | `serviceTargetENISGTags` | set of `key=value` pairs of AWS tags in addition to cluster name for finding the target ENI security group to which to add inbound rules from NLBs | None | | `loadBalancerClass` | Sets the AWS load balancer type to be used when the Kubernetes service requests an external load balancer | `service.k8s.aws/nlb` | | `creator` | if set to a `value!=helm`, it will disable the addition of default helm labels | `helm` | -| `runtimeClassName` | Runtime class name for the controller pods , such as `gvisor` or `kata`. An unspecified `nil` or empty `""` RuntimeClassName is equivalent to the backwards-compatible default behavior as if the RuntimeClass feature is disabled. | "" | +| `runtimeClassName` | Runtime class name for the controller pods , such as `gvisor` or `kata`. An unspecified `nil` or empty `""` RuntimeClassName is equivalent to the backwards-compatible default behavior as if the RuntimeClass feature is disabled. | "" | diff --git a/helm/aws-load-balancer-controller/templates/service.yaml b/helm/aws-load-balancer-controller/templates/service.yaml index aad0044ebd..e0073aa544 100644 --- 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 index 25dd013f38..8cd986dc36 100644 --- a/helm/aws-load-balancer-controller/values.yaml +++ b/helm/aws-load-balancer-controller/values.yaml @@ -388,6 +388,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