diff --git a/helm/aws-load-balancer-controller/Chart.yaml b/helm/aws-load-balancer-controller/Chart.yaml index f7ab53be1b..271600a6c5 100644 --- a/helm/aws-load-balancer-controller/Chart.yaml +++ b/helm/aws-load-balancer-controller/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: aws-load-balancer-controller description: AWS Load Balancer Controller Helm chart for Kubernetes -version: 1.5.3 +version: 1.5.4 appVersion: v2.5.2 home: https://github.com/aws/eks-charts icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png diff --git a/helm/aws-load-balancer-controller/README.md b/helm/aws-load-balancer-controller/README.md index ee4be9aad8..dd5ad9ee3d 100644 --- a/helm/aws-load-balancer-controller/README.md +++ b/helm/aws-load-balancer-controller/README.md @@ -248,6 +248,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.additionalLabels` | Labels to add to the service account | `{}` | | `serviceMonitor.interval` | Prometheus scrape interval | `1m` | @@ -255,4 +256,4 @@ The default values set by the application itself can be confirmed [here](https:/ | `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 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 874e565d7a..77c23e02e1 100644 --- a/helm/aws-load-balancer-controller/values.yaml +++ b/helm/aws-load-balancer-controller/values.yaml @@ -326,6 +326,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