From 0ad957e7a3f4531cd0d8c10b68d462f2cb972714 Mon Sep 17 00:00:00 2001
From: Kishor Joshi <joshikis@amazon.com>
Date: Thu, 20 Apr 2023 10:54:52 -0700
Subject: [PATCH] aws-load-balancer-controller: v2.5.1 (#938)

Co-authored-by: eks-bot <eks-bot@users.noreply.github.com>
---
 .../aws-load-balancer-controller/Chart.yaml   |  2 +-
 .../templates/webhook.yaml                    | 12 +++++++++
 .../aws-load-balancer-controller/values.yaml  | 26 +++++++++++--------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/stable/aws-load-balancer-controller/Chart.yaml b/stable/aws-load-balancer-controller/Chart.yaml
index 0bdba75e9..e91ededd9 100644
--- a/stable/aws-load-balancer-controller/Chart.yaml
+++ b/stable/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.1
+version: 1.5.2
 appVersion: v2.5.1
 home: https://github.com/aws/eks-charts
 icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
diff --git a/stable/aws-load-balancer-controller/templates/webhook.yaml b/stable/aws-load-balancer-controller/templates/webhook.yaml
index ab32fc8ff..ec01d7c58 100644
--- a/stable/aws-load-balancer-controller/templates/webhook.yaml
+++ b/stable/aws-load-balancer-controller/templates/webhook.yaml
@@ -69,6 +69,12 @@ webhooks:
   name: mservice.elbv2.k8s.aws
   admissionReviewVersions:
   - v1beta1
+  objectSelector:
+    matchExpressions:
+    - key: app.kubernetes.io/name
+      operator: NotIn
+      values:
+      - {{ include "aws-load-balancer-controller.name" . }}
   rules:
   - apiGroups:
     - ""
@@ -127,6 +133,12 @@ webhooks:
   name: vingressclassparams.elbv2.k8s.aws
   admissionReviewVersions:
   - v1beta1
+  objectSelector:
+    matchExpressions:
+    - key: app.kubernetes.io/name
+      operator: NotIn
+      values:
+      - {{ include "aws-load-balancer-controller.name" . }}
   rules:
   - apiGroups:
     - elbv2.k8s.aws
diff --git a/stable/aws-load-balancer-controller/values.yaml b/stable/aws-load-balancer-controller/values.yaml
index 40b3fae5a..69036d7dd 100644
--- a/stable/aws-load-balancer-controller/values.yaml
+++ b/stable/aws-load-balancer-controller/values.yaml
@@ -119,14 +119,18 @@ ingressClassParams:
   # The name of ingressClassParams resource will be referred in ingressClass
   name:
   spec: {}
-    # You always can set specifications in `helm install` command through `--set` or `--set-string`
-    # If you do want to specify specifications in values.yaml, uncomment the following
-    # lines, adjust them as necessary, and remove the curly braces after 'spec:'.
+    # Due to dependency issue, the validation webhook ignores this particular ingressClassParams resource.
+    # We recommend creating ingressClassParams resources separately after installing this chart and the
+    # controller is functional.
+    #
+    # You can set the specifications in the `helm install` command through `--set` or `--set-string`
+    # If you do want to specify in the values.yaml, uncomment the following
+    # lines, adjust them as necessary, and remove the curly braces after 'spec:'
+    #
     # namespaceSelector:
     #   matchLabels:
     # group:
     # scheme:
-    # subnets:
     # ipAddressType:
     # tags:
     # loadBalancerAttributes:
@@ -303,14 +307,14 @@ disableRestrictedSecurityGroupRules:
 controllerConfig:
   # featureGates set of key: value pairs that describe AWS load balance controller features
   featureGates: {}
-  # ListenerRulesTagging: false
-  # WeightedTargetGroups: false
+  # ListenerRulesTagging: true
+  # WeightedTargetGroups: true
   # ServiceTypeLoadBalancerOnly: false
   # EndpointsFailOpen: true
-  # EnableServiceController: false
-  # EnableIPTargetType: false
-  # SubnetsClusterTagCheck: false
-  # NLBHealthCheckAdvancedConfig: false
+  # EnableServiceController: true
+  # EnableIPTargetType: true
+  # SubnetsClusterTagCheck: true
+  # NLBHealthCheckAdvancedConfig: true
 
 # objectSelector for webhook
 objectSelector:
@@ -346,4 +350,4 @@ ingressClassConfig:
   default: false
 
 # enableServiceMutatorWebhook allows you enable the webhook which makes this controller the default for all new services of type LoadBalancer
-enableServiceMutatorWebhook: true
\ No newline at end of file
+enableServiceMutatorWebhook: true