Skip listener attributes reconcile for Isolated regions

Author: wweiwei-li

pkg/deploy/elbv2/listener_manager.go

@@ -3,6 +3,7 @@ package elbv2
 import (
 	"context"
 	"reflect"
+	"strings"
 	"time"
 
 	awssdk "github.com/aws/aws-sdk-go-v2/aws"
@@ -29,6 +30,12 @@ var PROTOCOLS_SUPPORTING_LISTENER_ATTRIBUTES = map[elbv2model.Protocol]bool{
 	elbv2model.ProtocolTLS:   false,
 }
 
+var isolatedRegions = map[string]bool{
+	"us-iso-east-1":  true,
+	"us-iso-west-1":  true,
+	"us-isob-east-1": true,
+}
+
 // ListenerManager is responsible for create/update/delete Listener resources.
 type ListenerManager interface {
 	Create(ctx context.Context, resLS *elbv2model.Listener) (elbv2model.ListenerStatus, error)
@@ -101,9 +108,12 @@ func (m *defaultListenerManager) Create(ctx context.Context, resLS *elbv2model.L
 	}); err != nil {
 		return elbv2model.ListenerStatus{}, errors.Wrap(err, "failed to update extra certificates on listener")
 	}
-	if areListenerAttributesSupported(resLS.Spec.Protocol) {
-		if err := m.attributesReconciler.Reconcile(ctx, resLS, sdkLS); err != nil {
-			return elbv2model.ListenerStatus{}, err
+	listenerARN := awssdk.ToString(sdkLS.Listener.ListenerArn)
+	if !isIsolatedRegion(getRegionFromARN(listenerARN)) {
+		if areListenerAttributesSupported(resLS.Spec.Protocol) {
+			if err := m.attributesReconciler.Reconcile(ctx, resLS, sdkLS); err != nil {
+				return elbv2model.ListenerStatus{}, err
+			}
 		}
 	}
 	return buildResListenerStatus(sdkLS), nil
@@ -121,9 +131,12 @@ func (m *defaultListenerManager) Update(ctx context.Context, resLS *elbv2model.L
 	if err := m.updateSDKListenerWithExtraCertificates(ctx, resLS, sdkLS, false); err != nil {
 		return elbv2model.ListenerStatus{}, err
 	}
-	if areListenerAttributesSupported(resLS.Spec.Protocol) {
-		if err := m.attributesReconciler.Reconcile(ctx, resLS, sdkLS); err != nil {
-			return elbv2model.ListenerStatus{}, err
+	listenerARN := awssdk.ToString(sdkLS.Listener.ListenerArn)
+	if !isIsolatedRegion(getRegionFromARN(listenerARN)) {
+		if areListenerAttributesSupported(resLS.Spec.Protocol) {
+			if err := m.attributesReconciler.Reconcile(ctx, resLS, sdkLS); err != nil {
+				return elbv2model.ListenerStatus{}, err
+			}
 		}
 	}
 	return buildResListenerStatus(sdkLS), nil
@@ -379,3 +392,18 @@ func areListenerAttributesSupported(protocol elbv2model.Protocol) bool {
 	supported, exists := PROTOCOLS_SUPPORTING_LISTENER_ATTRIBUTES[protocol]
 	return exists && supported
 }
+
+func getRegionFromARN(arn string) string {
+	if strings.HasPrefix(arn, "arn:") {
+		arnElements := strings.Split(arn, ":")
+		if len(arnElements) > 3 {
+			return arnElements[3]
+		}
+	}
+	return ""
+}
+
+func isIsolatedRegion(region string) bool {
+	_, exists := isolatedRegions[region]
+	return exists
+}

test/e2e/service/nlb_instance_target_test.go

@@ -160,20 +160,23 @@ var _ = Describe("test k8s service reconciled by the aws load balancer controlle
 				})
 				Expect(err).NotTo(HaveOccurred())
 			})
-			By("modifying listener attributes", func() {
-				err := stack.UpdateServiceAnnotations(ctx, tf, map[string]string{
-					"service.beta.kubernetes.io/aws-load-balancer-listener-attributes.TCP-80": "tcp.idle_timeout.seconds=400",
-				})
-				Expect(err).NotTo(HaveOccurred())
+			// remove this once listener attributes are available in ADC region
+			if tf.Options.AWSRegion != "us-iso-east-1" && tf.Options.AWSRegion != "us-iso-west-1" && tf.Options.AWSRegion != "us-isob-east-1" {
+				By("modifying listener attributes", func() {
+					err := stack.UpdateServiceAnnotations(ctx, tf, map[string]string{
+						"service.beta.kubernetes.io/aws-load-balancer-listener-attributes.TCP-80": "tcp.idle_timeout.seconds=400",
+					})
+					Expect(err).NotTo(HaveOccurred())
 
-				lsARN := getLoadBalancerListenerARN(ctx, tf, lbARN, "80")
+					lsARN := getLoadBalancerListenerARN(ctx, tf, lbARN, "80")
 
-				Eventually(func() bool {
-					return verifyListenerAttributes(ctx, tf, lsARN, map[string]string{
-						"tcp.idle_timeout.seconds": "400",
-					}) == nil
-				}, utils.PollTimeoutShort, utils.PollIntervalMedium).Should(BeTrue())
-			})
+					Eventually(func() bool {
+						return verifyListenerAttributes(ctx, tf, lsARN, map[string]string{
+							"tcp.idle_timeout.seconds": "400",
+						}) == nil
+					}, utils.PollTimeoutShort, utils.PollIntervalMedium).Should(BeTrue())
+				})
+			}
 		})
 		It("should provision internal load-balancer resources", func() {
 			By("deploying stack", func() {