@@ -19,26 +19,29 @@ import (
1919 "sync"
2020
2121 "istio.io/istio/pkg/config/host"
22- "istio.io/istio/pkg/util/sets"
2322)
2423
2524var (
2625 defaultClusterLocalNamespaces = []string {"kube-system" }
2726 defaultClusterLocalServices = []string {"kubernetes.default.svc" }
2827)
2928
30- // ClusterLocalHosts is a map of host names or wildcard patterns which should only
31- // be made accessible from within the same cluster.
29+ // ClusterLocalHosts is a map of host names or wildcard patterns which indicate
30+ // whether a host be made accessible from within the same cluster or not .
3231type ClusterLocalHosts struct {
33- specific sets. Set [host.Name ]
34- wildcard sets. Set [host.Name ]
32+ specific map [host.Name ]bool
33+ wildcard map [host.Name ]bool
3534}
3635
3736// IsClusterLocal indicates whether the given host should be treated as a
3837// cluster-local destination.
3938func (c ClusterLocalHosts ) IsClusterLocal (h host.Name ) bool {
40- _ , _ , ok := MostSpecificHostMatch (h , c .specific , c .wildcard )
41- return ok
39+ _ , local , ok := MostSpecificHostMatch (h , c .specific , c .wildcard )
40+ // Explicitly set clusterLocal to false if host is not found in clusterLocal settings
41+ if ! ok {
42+ local = false
43+ }
44+ return local
4245}
4346
4447// ClusterLocalProvider provides the cluster-local hosts.
@@ -98,22 +101,15 @@ func (c *clusterLocalProvider) onMeshUpdated(e *Environment) {
98101
99102 // Collect the cluster-local hosts.
100103 hosts := ClusterLocalHosts {
101- specific : make (map [host.Name ]struct {}, 0 ),
102- wildcard : make (map [host.Name ]struct {}, 0 ),
104+ specific : make (map [host.Name ]bool ),
105+ wildcard : make (map [host.Name ]bool ),
103106 }
107+
104108 for _ , serviceSettings := range e .Mesh ().ServiceSettings {
105- if serviceSettings .GetSettings ().GetClusterLocal () {
106- for _ , h := range serviceSettings .GetHosts () {
107- hostname := host .Name (h )
108- if hostname .IsWildCarded () {
109- hosts .wildcard .Insert (hostname )
110- } else {
111- hosts .specific .Insert (hostname )
112- }
113- }
114- } else {
115- // Remove defaults if specified to be non-cluster-local.
116- for _ , h := range serviceSettings .GetHosts () {
109+ isClusterLocal := serviceSettings .GetSettings ().GetClusterLocal ()
110+ for _ , h := range serviceSettings .GetHosts () {
111+ // If clusterLocal false, check to see if we should remove a default clusterLocal host.
112+ if ! isClusterLocal {
117113 for i , defaultClusterLocalHost := range defaultClusterLocalHosts {
118114 if len (defaultClusterLocalHost ) > 0 {
119115 if h == string (defaultClusterLocalHost ) ||
@@ -126,15 +122,25 @@ func (c *clusterLocalProvider) onMeshUpdated(e *Environment) {
126122 }
127123 }
128124 }
125+
126+ // Add hosts with their clusterLocal setting to sets.
127+ for _ , h := range serviceSettings .GetHosts () {
128+ hostname := host .Name (h )
129+ if hostname .IsWildCarded () {
130+ hosts .wildcard [hostname ] = isClusterLocal
131+ } else {
132+ hosts .specific [hostname ] = isClusterLocal
133+ }
134+ }
129135 }
130136
131137 // Add any remaining defaults to the end of the list.
132138 for _ , defaultClusterLocalHost := range defaultClusterLocalHosts {
133139 if len (defaultClusterLocalHost ) > 0 {
134140 if defaultClusterLocalHost .IsWildCarded () {
135- hosts .wildcard . Insert ( defaultClusterLocalHost )
141+ hosts .wildcard [ defaultClusterLocalHost ] = true
136142 } else {
137- hosts .specific . Insert ( defaultClusterLocalHost )
143+ hosts .specific [ defaultClusterLocalHost ] = true
138144 }
139145 }
140146 }
0 commit comments