Skip to content

Commit

Permalink
Revert "multi-network: fix eastwest gateway endpoint filtering (istio…
Browse files Browse the repository at this point in the history
…#38762) (istio#39275)"

This reverts commit 097fed9.
  • Loading branch information
lei-tang committed Jun 9, 2022
1 parent 9085e55 commit f556891
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 21 deletions.
20 changes: 6 additions & 14 deletions pilot/pkg/xds/endpoint_builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,10 @@ func NewEndpointBuilder(clusterName string, proxy *model.Proxy, push *model.Push
port: port,
}

passthroughMode := model.IsDNSSrvSubsetKey(clusterName)
// We need this for multi-network, or for clusters meant for use with AUTO_PASSTHROUGH.
if features.EnableAutomTLSCheckPolicies ||
b.push.NetworkManager().IsMultiNetworkEnabled() || passthroughMode {
b.mtlsChecker = newMtlsChecker(push, port, dr, passthroughMode)
b.push.NetworkManager().IsMultiNetworkEnabled() || model.IsDNSSrvSubsetKey(clusterName) {
b.mtlsChecker = newMtlsChecker(push, port, dr)
}
return b
}
Expand Down Expand Up @@ -436,26 +435,19 @@ type mtlsChecker struct {
rootPolicyMode *networkingapi.ClientTLSSettings_TLSmode
}

func newMtlsChecker(push *model.PushContext, svcPort int, dr *config.Config, passthroughMode bool) *mtlsChecker {
var rootPolicyMode *networkingapi.ClientTLSSettings_TLSmode
func newMtlsChecker(push *model.PushContext, svcPort int, dr *config.Config) *mtlsChecker {
var drSpec *networkingapi.DestinationRule

// tcp passthrough gateways don't care about client settings
if !passthroughMode {
rootPolicyMode = mtlsModeForDefaultTrafficPolicy(dr, svcPort)
if dr != nil {
drSpec = dr.Spec.(*networkingapi.DestinationRule)
}
if dr != nil {
drSpec = dr.Spec.(*networkingapi.DestinationRule)
}

return &mtlsChecker{
push: push,
svcPort: svcPort,
destinationRule: drSpec,
mtlsDisabledHosts: map[string]struct{}{},
peerAuthDisabledMTLS: map[string]bool{},
subsetPolicyMode: map[string]*networkingapi.ClientTLSSettings_TLSmode{},
rootPolicyMode: rootPolicyMode,
rootPolicyMode: mtlsModeForDefaultTrafficPolicy(dr, svcPort),
}
}

Expand Down
7 changes: 0 additions & 7 deletions releasenotes/notes/38704.yaml

This file was deleted.

0 comments on commit f556891

Please sign in to comment.