Skip to content

Commit 3d4c813

Browse files
authored
Remove default for destination lookup subnets (#399)
Related to #3807, but serves as a more temporary fix until the proxy injector provides a way for this to be configured from an install. Signed-off-by: Kevin Leimkuhler <[email protected]>
1 parent 0a33b8c commit 3d4c813

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

linkerd/app/src/env.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,6 @@ const DEFAULT_OUTBOUND_MAX_IN_FLIGHT: usize = 10_000;
196196
const DEFAULT_DESTINATION_GET_SUFFIXES: &str = "svc.cluster.local.";
197197
const DEFAULT_DESTINATION_PROFILE_SUFFIXES: &str = "svc.cluster.local.";
198198

199-
// RFC6890 private networks
200-
// Doesn't make sense to include the IPv6 network yet (fd00::/8).
201-
const DEFAULT_DESTINATION_GET_NETWORKS: &str = "10.0.0.0/8,172.16.0.0/12,192.168.0.0/16";
202-
203199
const DEFAULT_IDENTITY_MIN_REFRESH: Duration = Duration::from_secs(10);
204200
const DEFAULT_IDENTITY_MAX_REFRESH: Duration = Duration::from_secs(60 * 60 * 24);
205201

@@ -408,8 +404,7 @@ pub fn parse_config<S: Strings>(strings: &S) -> Result<super::Config, EnvError>
408404
context: dst_token?.unwrap_or_default(),
409405
get_suffixes: dst_get_suffixes?
410406
.unwrap_or(parse_dns_suffixes(DEFAULT_DESTINATION_GET_SUFFIXES).unwrap()),
411-
get_networks: dst_get_networks?
412-
.unwrap_or(parse_networks(DEFAULT_DESTINATION_GET_NETWORKS).unwrap()),
407+
get_networks: dst_get_networks?.unwrap_or_default(),
413408
profile_suffixes: dst_profile_suffixes?
414409
.unwrap_or(parse_dns_suffixes(DEFAULT_DESTINATION_PROFILE_SUFFIXES).unwrap()),
415410
control: ControlConfig {

0 commit comments

Comments
 (0)