updated fix

kubernetes-sigs · May 30, 2024 · 90d61d8 · 90d61d8
1 parent a8a598c
commit 90d61d8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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(),