Skip to content

Commit

Permalink
Don't override resolv.conf DNS resolver unless required. Update cockr…
Browse files Browse the repository at this point in the history
…oachdb/swiss.
  • Loading branch information
dkorunic committed Feb 28, 2024
1 parent d2d8497 commit 014cb38
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ toolchain go1.22.0
require (
github.com/KimMachineGun/automemlimit v0.5.0
github.com/avast/retry-go/v4 v4.5.1
github.com/cockroachdb/swiss v0.0.0-20240226223847-16079ed4d941
github.com/cockroachdb/swiss v0.0.0-20240228123450-7b50593e7686
github.com/miekg/dns v1.1.58
github.com/monoidic/cidranger v1.0.4
go.uber.org/automaxprocs v1.5.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ github.com/avast/retry-go/v4 v4.5.1 h1:AxIx0HGi4VZ3I02jr78j5lZ3M6x1E0Ivxa6b0pUUh
github.com/avast/retry-go/v4 v4.5.1/go.mod h1:/sipNsvNB3RRuT5iNcb6h73nw3IBmXJ/H3XrCQYSOpc=
github.com/cilium/ebpf v0.13.2 h1:uhLimLX+jF9BTPPvoCUYh/mBeoONkjgaJ9w9fn0mRj4=
github.com/cilium/ebpf v0.13.2/go.mod h1:DHp1WyrLeiBh19Cf/tfiSMhqheEiK8fXFZ4No0P1Hso=
github.com/cockroachdb/swiss v0.0.0-20240226223847-16079ed4d941 h1:07qtRTYzDBVh8C6ApoY7rc7wB774oYQe6Zn9dSmkC7Q=
github.com/cockroachdb/swiss v0.0.0-20240226223847-16079ed4d941/go.mod h1:kvAEHbo4OwYBZpQIKRqjj2hxpFj8WhgtzDg8ZtrhaIc=
github.com/cockroachdb/swiss v0.0.0-20240228123450-7b50593e7686 h1:IbAPtNR6gBDcdknthFOkBIqpbPm5Yzjh4lfs2Zd5Flw=
github.com/cockroachdb/swiss v0.0.0-20240228123450-7b50593e7686/go.mod h1:kvAEHbo4OwYBZpQIKRqjj2hxpFj8WhgtzDg8ZtrhaIc=
github.com/containerd/cgroups/v3 v3.0.3 h1:S5ByHZ/h9PMe5IOQoN7E+nMc2UcLEM/V48DGDJ9kip0=
github.com/containerd/cgroups/v3 v3.0.3/go.mod h1:8HBe7V3aWGLFPd/k03swSIsGjZhHI2WzJmticMgVuz0=
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
Expand Down
2 changes: 1 addition & 1 deletion options.go
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ func parseFlags() ([]string, string, []string) {
}

// check if resolverIP is in server:port format
if !strings.Contains(*resolverAddress, portSeparator) {
if *resolverAddress != "" && !strings.Contains(*resolverAddress, portSeparator) {
*resolverAddress = net.JoinHostPort(*resolverAddress, dnsPort)
}

Expand Down

0 comments on commit 014cb38

Please sign in to comment.