Skip to content

Commit f581575

Browse files
authored
Merge pull request #55 from contentful-labs/update-dependencies
Update dependencies (Go, Modules, Base image..)
2 parents 8b35cf6 + ed2bf7d commit f581575

File tree

1,156 files changed

+148839
-44219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,156 files changed

+148839
-44219
lines changed

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM golang:1.22.5 AS builder
1+
FROM golang:1.23.4 AS builder
22

33
RUN apt update && apt upgrade -y && apt install iptables -y
44

5-
RUN git clone --single-branch --branch v1.11.3 https://github.com/coredns/coredns.git /coredns
5+
RUN git clone --single-branch --branch v1.12.0 https://github.com/coredns/coredns.git /coredns
66

77
WORKDIR /coredns
88

@@ -16,7 +16,7 @@ COPY *.go /coredns/plugin/nodecache/
1616
RUN make
1717
RUN chmod 0755 /coredns/coredns
1818

19-
FROM alpine:3.20.2
19+
FROM alpine:3.21.2
2020
RUN apk add iptables
2121

2222
COPY --from=builder /coredns/coredns /

Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ run: build
1212

1313
test:
1414
docker run -t -v $$PWD:/go/src/github.com/contentful-labs/coredns-nodecache \
15-
-w /go/src/github.com/contentful-labs/coredns-nodecache/ golang:1.18-buster go test -v -mod=vendor ./...
15+
-w /go/src/github.com/contentful-labs/coredns-nodecache/ golang:1.23.4-bookworm go test -v -mod=vendor ./...
1616

1717
lint:
1818
docker run -t -v $$PWD:/go/src/github.com/contentful-labs/coredns-nodecache \
19-
-w /go/src/github.com/contentful-labs/coredns-nodecache/ golangci/golangci-lint:v1.46.2 golangci-lint run
19+
-w /go/src/github.com/contentful-labs/coredns-nodecache/ golangci/golangci-lint:v1.63.4 golangci-lint run

go.mod

+31-23
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,44 @@
11
module github.com/contentful/coredns-nodecache
22

3-
go 1.17
3+
go 1.22.7
4+
5+
toolchain go1.23.2
46

57
require (
6-
github.com/coredns/caddy v1.1.1
7-
github.com/coredns/coredns v1.9.3
8-
github.com/coreos/go-iptables v0.6.0
9-
github.com/vishvananda/netlink v1.1.0
10-
golang.org/x/sys v0.18.0
8+
github.com/coredns/caddy v1.1.2-0.20241029205200-8de985351a98
9+
github.com/coredns/coredns v1.12.0
10+
github.com/coreos/go-iptables v0.8.0
11+
github.com/vishvananda/netlink v1.3.0
12+
golang.org/x/sys v0.29.0
1113
)
1214

1315
require (
1416
github.com/apparentlymart/go-cidr v1.1.0 // indirect
1517
github.com/beorn7/perks v1.0.1 // indirect
16-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
18+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1719
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
18-
github.com/golang/protobuf v1.5.3 // indirect
20+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
21+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
1922
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
20-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
21-
github.com/miekg/dns v1.1.49 // indirect
23+
github.com/miekg/dns v1.1.62 // indirect
24+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
25+
github.com/onsi/ginkgo/v2 v2.22.2 // indirect
2226
github.com/opentracing/opentracing-go v1.2.0 // indirect
23-
github.com/prometheus/client_golang v1.12.2 // indirect
24-
github.com/prometheus/client_model v0.2.0 // indirect
25-
github.com/prometheus/common v0.34.0 // indirect
26-
github.com/prometheus/procfs v0.7.3 // indirect
27-
github.com/stretchr/testify v1.7.1 // indirect
28-
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
29-
golang.org/x/mod v0.8.0 // indirect
30-
golang.org/x/net v0.23.0 // indirect
31-
golang.org/x/text v0.14.0 // indirect
32-
golang.org/x/tools v0.6.0 // indirect
33-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
34-
google.golang.org/grpc v1.56.3 // indirect
35-
google.golang.org/protobuf v1.33.0 // indirect
27+
github.com/prometheus/client_golang v1.20.5 // indirect
28+
github.com/prometheus/client_model v0.6.1 // indirect
29+
github.com/prometheus/common v0.61.0 // indirect
30+
github.com/prometheus/procfs v0.15.1 // indirect
31+
github.com/quic-go/quic-go v0.48.2 // indirect
32+
github.com/vishvananda/netns v0.0.5 // indirect
33+
go.uber.org/mock v0.5.0 // indirect
34+
golang.org/x/crypto v0.32.0 // indirect
35+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
36+
golang.org/x/mod v0.22.0 // indirect
37+
golang.org/x/net v0.34.0 // indirect
38+
golang.org/x/sync v0.10.0 // indirect
39+
golang.org/x/text v0.21.0 // indirect
40+
golang.org/x/tools v0.29.0 // indirect
41+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 // indirect
42+
google.golang.org/grpc v1.69.4 // indirect
43+
google.golang.org/protobuf v1.36.2 // indirect
3644
)

go.sum

+89-2,349
Large diffs are not rendered by default.

vendor/github.com/cespare/xxhash/v2/README.md

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/xxhash.go

+22-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/xxhash_asm.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/xxhash_other.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/xxhash_safe.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/cespare/xxhash/v2/xxhash_unsafe.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coredns/caddy/README.md

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coredns/caddy/caddy.go

+18-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coredns/caddy/plugins.go

+6-26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coredns/coredns/core/dnsserver/address.go

+18-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)