Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop improper workload DNS lookups (#1120) #1123

Merged
merged 1 commit into from
Jun 11, 2024
Merged

Drop improper workload DNS lookups (#1120) #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 9 additions & 13 deletions src/dns/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,14 +380,8 @@ impl Store {
name: search_name,
alias,
});
} else if let Some(wl) = state.workloads.find_hostname(&search_name_str) {
// Didn't find a service, try a workload.
return Some(ServerMatch {
server: Address::Workload(wl),
name: search_name,
alias,
});
}
// TODO(): add support for workload lookups for headless pods
}
}

Expand Down Expand Up @@ -1212,18 +1206,20 @@ mod tests {
a(n("headless.ns1.svc.cluster.local."), ipv4("31.31.31.31"))],
..Default::default()
},
// TODO(https://github.com/istio/ztunnel/issues/1119)
Case {
name: "success: k8s pod - fqdn",
name: "todo: k8s pod - fqdn",
host: "headless.pod0.ns1.svc.cluster.local.",
expect_records: vec![
a(n("headless.pod0.ns1.svc.cluster.local."), ipv4("30.30.30.30"))],
expect_authoritative: false, // forwarded.
expect_code: ResponseCode::NXDomain,
..Default::default()
},
// TODO(https://github.com/istio/ztunnel/issues/1119)
Case {
name: "success: k8s pod - name.domain.ns",
name: "todo: k8s pod - name.domain.ns",
host: "headless.pod0.ns1.",
expect_records: vec![
a(n("headless.pod0.ns1."), ipv4("30.30.30.30"))],
expect_authoritative: false, // forwarded.
expect_code: ResponseCode::NXDomain,
..Default::default()
},
Case {
Expand Down
14 changes: 5 additions & 9 deletions src/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,15 +227,11 @@ impl ProxyState {
pub fn find_hostname(&self, name: &NamespacedHostname) -> Option<Address> {
// Hostnames for services are more common, so lookup service first and fallback
// to workload.
match self.services.get_by_namespaced_host(name) {
None => {
// Workload hostnames are globally unique, so ignore the namespace.
self.workloads
.find_hostname(&name.hostname)
.map(Address::Workload)
}
Some(svc) => Some(Address::Service(svc)),
}
// We do not looking up workloads by hostname. We could, but we only allow referencing "frontends",
// not backends
self.services
.get_by_namespaced_host(name)
.map(Address::Service)
}

fn find_upstream(
Expand Down
12 changes: 0 additions & 12 deletions src/state/workload.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,6 @@ pub struct WorkloadStore {
pub(super) by_addr: HashMap<NetworkAddress, Arc<Workload>>,
/// byUid maps workload UIDs to workloads
by_uid: HashMap<Strng, Arc<Workload>>,
/// byHostname maps workload hostname to workloads.
by_hostname: HashMap<Strng, Arc<Workload>>,
// Identity->Set of UIDs. Only stores local nodes
by_identity: HashMap<Identity, HashSet<Strng>>,
}
Expand All @@ -612,7 +610,6 @@ impl Default for WorkloadStore {
WorkloadStore {
insert_notifier: Sender::new(()),
by_addr: Default::default(),
by_hostname: Default::default(),
by_identity: Default::default(),
by_uid: Default::default(),
}
Expand All @@ -635,9 +632,6 @@ impl WorkloadStore {
self.by_addr
.insert(network_addr(w.network.clone(), *ip), w.clone());
}
if !w.hostname.is_empty() {
self.by_hostname.insert(w.hostname.clone(), w.clone());
}
self.by_uid.insert(w.uid.clone(), w.clone());
// Only track local nodes to avoid overhead
if track_identity {
Expand All @@ -663,7 +657,6 @@ impl WorkloadStore {
self.by_addr
.remove(&network_addr(prev.network.clone(), *wip));
}
self.by_hostname.remove(&prev.hostname);

let id = prev.identity();
if let Some(set) = self.by_identity.get_mut(&id) {
Expand All @@ -682,11 +675,6 @@ impl WorkloadStore {
self.by_addr.get(addr).cloned()
}

/// Finds the workload by hostname.
pub fn find_hostname(&self, hostname: &Strng) -> Option<Arc<Workload>> {
self.by_hostname.get(hostname).cloned()
}

/// Finds the workload by uid.
pub fn find_uid(&self, uid: &Strng) -> Option<Arc<Workload>> {
self.by_uid.get(uid).cloned()
Expand Down