Merge branch 'kubernetes-sigs:main' into main

shraddhabang · Oct 31, 2024 · 8043f08 · 8043f08
2 parents 500fe5a + 2d8cbe7
commit 8043f08
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 7 deletions.
diff --git a/.go-version b/.go-version
@@ -1 +1 @@
-1.22.7
+1.22.8
diff --git a/docs/deploy/configurations.md b/docs/deploy/configurations.md
@@ -162,7 +162,7 @@ If running on EC2, the default values are obtained from the instance metadata se
 
 
 ### Feature Gates
-They are a set of kye=value pairs that describe AWS load balance controller features. You can use it as flags `--feature-gates=key1=value1,key2=value2`
+There are a set of key=value pairs that describe AWS load balancer controller features. You can use it as flags `--feature-gates=key1=value1,key2=value2`
 
 |Features-gate Supported Key            | Type                            | Default Value | Description                                                                                                                                                                          |
 |---------------------------------------|---------------------------------|---------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|

diff --git a/docs/guide/ingress/annotations.md b/docs/guide/ingress/annotations.md
@@ -782,7 +782,7 @@ TLS support can be controlled with the following annotations:
             alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:us-west-2:xxxxx:certificate/cert1,arn:aws:acm:us-west-2:xxxxx:certificate/cert2,arn:aws:acm:us-west-2:xxxxx:certificate/cert3
             ```
 
-- <a name="ssl-policy">`alb.ingress.kubernetes.io/ssl-policy`</a> specifies the [Security Policy](https://docs.aws.amazon.com/elasticloadbalancing/latest/application/create-https-listener.html#describe-ssl-policies) that should be assigned to the ALB, allowing you to control the protocol and ciphers.
+- <a name="ssl-policy">`alb.ingress.kubernetes.io/ssl-policy`</a> specifies the [Security Policy](https://docs.aws.amazon.com/elasticloadbalancing/latest/application/describe-ssl-policies.html) that should be assigned to the ALB, allowing you to control the protocol and ciphers.
 
     !!!example
         ```

diff --git a/docs/guide/integrations/external_dns.md b/docs/guide/integrations/external_dns.md
@@ -73,4 +73,4 @@ Adequate roles and policies must be configured in AWS and available to the node(
       external-dns.alpha.kubernetes.io/aws-weight: "100"
       external-dns.alpha.kubernetes.io/set-identifier: "3"
    ```
-   You can refer to the External DNS documentation for further details [[link](https://kubernetes-sigs.github.io/external-dns/latest/tutorials/aws/#routing-policies)]. 
+   You can refer to the External DNS documentation for further details [[link](https://kubernetes-sigs.github.io/external-dns/latest/docs/tutorials/aws/#routing-policies)]. 
diff --git a/docs/install/iam_policy.json b/docs/install/iam_policy.json
@@ -29,6 +29,7 @@
                 "ec2:DescribeTags",
                 "ec2:GetCoipPoolUsage",
                 "ec2:DescribeCoipPools",
+                "ec2:GetSecurityGroupsForVpc",
                 "elasticloadbalancing:DescribeLoadBalancers",
                 "elasticloadbalancing:DescribeLoadBalancerAttributes",
                 "elasticloadbalancing:DescribeListeners",

diff --git a/docs/install/iam_policy_cn.json b/docs/install/iam_policy_cn.json
@@ -29,6 +29,7 @@
                 "ec2:DescribeTags",
                 "ec2:GetCoipPoolUsage",
                 "ec2:DescribeCoipPools",
+                "ec2:GetSecurityGroupsForVpc",
                 "elasticloadbalancing:DescribeLoadBalancers",
                 "elasticloadbalancing:DescribeLoadBalancerAttributes",
                 "elasticloadbalancing:DescribeListeners",

diff --git a/docs/install/iam_policy_iso.json b/docs/install/iam_policy_iso.json
@@ -29,6 +29,7 @@
                 "ec2:DescribeTags",
                 "ec2:GetCoipPoolUsage",
                 "ec2:DescribeCoipPools",
+                "ec2:GetSecurityGroupsForVpc",
                 "elasticloadbalancing:DescribeLoadBalancers",
                 "elasticloadbalancing:DescribeLoadBalancerAttributes",
                 "elasticloadbalancing:DescribeListeners",

diff --git a/docs/install/iam_policy_isob.json b/docs/install/iam_policy_isob.json
@@ -29,6 +29,7 @@
                 "ec2:DescribeTags",
                 "ec2:GetCoipPoolUsage",
                 "ec2:DescribeCoipPools",
+                "ec2:GetSecurityGroupsForVpc",
                 "elasticloadbalancing:DescribeLoadBalancers",
                 "elasticloadbalancing:DescribeLoadBalancerAttributes",
                 "elasticloadbalancing:DescribeListeners",

diff --git a/docs/install/iam_policy_us-gov.json b/docs/install/iam_policy_us-gov.json
@@ -29,6 +29,7 @@
                 "ec2:DescribeTags",
                 "ec2:GetCoipPoolUsage",
                 "ec2:DescribeCoipPools",
+                "ec2:GetSecurityGroupsForVpc",
                 "elasticloadbalancing:DescribeLoadBalancers",
                 "elasticloadbalancing:DescribeLoadBalancerAttributes",
                 "elasticloadbalancing:DescribeListeners",

diff --git a/pkg/aws/provider/default_aws_clients_provider.go b/pkg/aws/provider/default_aws_clients_provider.go
@@ -57,7 +57,7 @@ func NewDefaultAWSClientsProvider(cfg aws.Config, endpointsResolver *endpoints.R
 		o.BaseEndpoint = wafregionalCustomEndpoint
 	})
 	sheildClient := shield.NewFromConfig(cfg, func(o *shield.Options) {
-		o.Region = "us-east-1"
+		o.Region = cfg.Region
 		o.BaseEndpoint = shieldCustomEndpoint
 	})
 	rgtClient := resourcegroupstaggingapi.NewFromConfig(cfg, func(o *resourcegroupstaggingapi.Options) {

diff --git a/pkg/targetgroupbinding/resource_manager.go b/pkg/targetgroupbinding/resource_manager.go
@@ -540,8 +540,8 @@ func (m *defaultResourceManager) registerPodEndpoints(ctx context.Context, tgARN
 	// Target group is in a different VPC from the cluster's VPC
 	if tgVpcID != "" && tgVpcID != m.vpcID {
 		vpcID = tgVpcID
-		m.logger.Info("registering endpoints using the targetGroup's vpcID", tgVpcID,
-			"which is different from the cluster's vpcID", m.vpcID)
+		m.logger.Info("registering endpoints using the targetGroup's vpcID", "TG VPC", tgVpcID,
+			"cluster's vpcID", m.vpcID)
 	}
 	vpcInfo, err := m.vpcInfoProvider.FetchVPCInfo(ctx, vpcID)
 	if err != nil {