From 90d61d899b4455a27702c79580f6baf41ac4e8b6 Mon Sep 17 00:00:00 2001 From: "yogiii@amazon.com" Date: Thu, 30 May 2024 13:14:25 -0700 Subject: [PATCH] updated fix --- pkg/deploy/elbv2/listener_manager.go | 2 +- pkg/ingress/model_builder.go | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkg/deploy/elbv2/listener_manager.go b/pkg/deploy/elbv2/listener_manager.go index 22400da9d..44b2308d5 100644 --- a/pkg/deploy/elbv2/listener_manager.go +++ b/pkg/deploy/elbv2/listener_manager.go @@ -267,7 +267,7 @@ func isSDKListenerSettingsDrifted(lsSpec elbv2model.ListenerSpec, sdkLS Listener if len(lsSpec.ALPNPolicy) != 0 && !cmp.Equal(lsSpec.ALPNPolicy, awssdk.StringValueSlice(sdkLS.Listener.AlpnPolicy), cmpopts.EquateEmpty()) { return true } - if !reflect.DeepEqual(desiredDefaultMutualAuthentication, sdkLS.Listener.MutualAuthentication) { + if desiredDefaultMutualAuthentication != nil && !reflect.DeepEqual(desiredDefaultMutualAuthentication, sdkLS.Listener.MutualAuthentication) { return true } diff --git a/pkg/ingress/model_builder.go b/pkg/ingress/model_builder.go index 9c50c2a14..ec753247d 100644 --- a/pkg/ingress/model_builder.go +++ b/pkg/ingress/model_builder.go @@ -381,12 +381,6 @@ func (t *defaultModelBuildTask) mergeListenPortConfigs(_ context.Context, listen mergedSSLPolicy = awssdk.String(t.defaultSSLPolicy) } - if mergedProtocol == elbv2model.ProtocolHTTPS && mergedMtlsAttributes == nil { - mergedMtlsAttributes = &elbv2model.MutualAuthenticationAttributes{ - Mode: string(elbv2model.MutualAuthenticationOffMode), - } - } - return listenPortConfig{ protocol: mergedProtocol, inboundCIDRv4s: mergedInboundCIDRv4s.List(),