Skip to content

Commit 2ca9055

Browse files
committed
update to v0.20 and prepare for 0.21
Signed-off-by: Jan Jansen <jan.jansen@gdata.de>
1 parent 0481540 commit 2ca9055

File tree

6 files changed

+164
-142
lines changed

6 files changed

+164
-142
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24-bookworm AS builder
1+
FROM golang:1.25-bookworm AS builder
22

33
COPY . /code/external-dns-coredns-webhook
44
WORKDIR /code/external-dns-coredns-webhook

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# ExternalDNS Plugin CoreDNS Webhook
22

3+
## Deprecated
4+
5+
With the release of version 0.21 or newer, every function is now included inside the in-tree provider.
6+
37
## Commandline
48

59
```

coredns.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ type Service struct {
9494

9595
// ManagedBy is used to prevent service to be added by different external-dns (only used by external-dns)
9696
ManagedBy string `json:"managedby,omitempty"`
97+
98+
// OwnedBy is used to prevent service to be added by different external-dns (only used by external-dns)
99+
OwnedBy string `json:"ownedby,omitempty"`
97100
}
98101

99102
type etcdClient struct {
@@ -130,6 +133,7 @@ func (c etcdClient) GetServices(ctx context.Context, prefix string) ([]*Service,
130133
Text: svc.Text,
131134
Key: string(n.Key),
132135
ManagedBy: svc.ManagedBy,
136+
OwnedBy: svc.OwnedBy,
133137
}
134138
if _, ok := bx[b]; ok {
135139
// skip the service if already added to service list.
@@ -162,6 +166,7 @@ func (c etcdClient) SaveService(ctx context.Context, service *Service) error {
162166

163167
if c.managedBy != "" {
164168
service.ManagedBy = c.managedBy
169+
service.OwnedBy = c.managedBy
165170
}
166171
if ownedBy, err := c.IsOwnedBy(ctx, service.Key); err != nil {
167172
return err

coredns_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -944,6 +944,7 @@ func TestSaveService(t *testing.T) {
944944
Text: "hello",
945945
Key: "/prefix/1",
946946
ManagedBy: "managed-by",
947+
OwnedBy: "managed-by",
947948
},
948949
},
949950
{
@@ -966,6 +967,7 @@ func TestSaveService(t *testing.T) {
966967
Text: "hello",
967968
Key: "/prefix/1",
968969
ManagedBy: "managed-by",
970+
OwnedBy: "managed-by",
969971
},
970972
},
971973
{
@@ -989,6 +991,7 @@ func TestSaveService(t *testing.T) {
989991
Text: "hello",
990992
Key: "/prefix/1",
991993
ManagedBy: "managed-by",
994+
OwnedBy: "managed-by",
992995
},
993996
},
994997
{

go.mod

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,86 @@
11
module github.com/GDATASoftwareAG/external-dns-coredns-webhook
22

3-
go 1.24.2
4-
5-
toolchain go1.24.5
3+
go 1.25
64

75
require (
86
github.com/alecthomas/kingpin v2.2.6+incompatible
97
github.com/sirupsen/logrus v1.9.3
108
github.com/stretchr/testify v1.11.1
11-
go.etcd.io/etcd/api/v3 v3.6.5
12-
go.etcd.io/etcd/client/v3 v3.6.5
13-
sigs.k8s.io/external-dns v0.19.0
9+
go.etcd.io/etcd/api/v3 v3.6.6
10+
go.etcd.io/etcd/client/v3 v3.6.6
11+
sigs.k8s.io/external-dns v0.20.0
1412
)
1513

1614
require (
1715
github.com/alecthomas/kingpin/v2 v2.4.0 // indirect
1816
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
19-
github.com/alecthomas/units v0.0.0-20240626203959-61d1e3462e30 // indirect
20-
github.com/aws/aws-sdk-go-v2/service/route53 v1.56.2 // indirect
21-
github.com/aws/smithy-go v1.22.5 // indirect
17+
github.com/alecthomas/units v0.0.0-20240927000941-0f3dac36c52b // indirect
18+
github.com/aws/aws-sdk-go-v2/service/route53 v1.59.5 // indirect
19+
github.com/aws/smithy-go v1.23.2 // indirect
2220
github.com/beorn7/perks v1.0.1 // indirect
2321
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2422
github.com/coreos/go-semver v0.3.1 // indirect
2523
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
2624
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
27-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
25+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
2826
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
29-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
27+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3028
github.com/go-logr/logr v1.4.3 // indirect
31-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
29+
github.com/go-openapi/jsonpointer v0.21.2 // indirect
3230
github.com/go-openapi/jsonreference v0.21.0 // indirect
33-
github.com/go-openapi/swag v0.23.0 // indirect
31+
github.com/go-openapi/swag v0.23.1 // indirect
3432
github.com/gogo/protobuf v1.3.2 // indirect
3533
github.com/golang/protobuf v1.5.4 // indirect
36-
github.com/google/gnostic-models v0.6.9 // indirect
34+
github.com/google/gnostic-models v0.7.0 // indirect
3735
github.com/google/go-cmp v0.7.0 // indirect
3836
github.com/google/uuid v1.6.0 // indirect
3937
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
38+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4039
github.com/josharian/intern v1.0.0 // indirect
4140
github.com/json-iterator/go v1.1.12 // indirect
4241
github.com/mailru/easyjson v0.9.0 // indirect
4342
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
44-
github.com/modern-go/reflect2 v1.0.2 // indirect
43+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4544
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
46-
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
47-
github.com/onsi/gomega v1.37.0 // indirect
48-
github.com/pkg/errors v0.9.1 // indirect
45+
github.com/onsi/ginkgo/v2 v2.25.3 // indirect
46+
github.com/onsi/gomega v1.38.2 // indirect
4947
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
50-
github.com/prometheus/client_golang v1.23.0 // indirect
48+
github.com/prometheus/client_golang v1.23.2 // indirect
5149
github.com/prometheus/client_model v0.6.2 // indirect
52-
github.com/prometheus/common v0.65.0 // indirect
53-
github.com/prometheus/procfs v0.16.1 // indirect
54-
github.com/spf13/pflag v1.0.7 // indirect
50+
github.com/prometheus/common v0.67.2 // indirect
51+
github.com/prometheus/procfs v0.17.0 // indirect
52+
github.com/spf13/cobra v1.10.1 // indirect
53+
github.com/spf13/pflag v1.0.9 // indirect
5554
github.com/stretchr/objx v0.5.2 // indirect
5655
github.com/x448/float16 v0.8.4 // indirect
5756
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
58-
go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
57+
go.etcd.io/etcd/client/pkg/v3 v3.6.6 // indirect
5958
go.uber.org/multierr v1.11.0 // indirect
6059
go.uber.org/zap v1.27.0 // indirect
61-
golang.org/x/net v0.43.0 // indirect
62-
golang.org/x/oauth2 v0.30.0 // indirect
63-
golang.org/x/sys v0.35.0 // indirect
64-
golang.org/x/term v0.34.0 // indirect
65-
golang.org/x/text v0.28.0 // indirect
66-
golang.org/x/time v0.12.0 // indirect
67-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
68-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
69-
google.golang.org/grpc v1.74.2 // indirect
70-
google.golang.org/protobuf v1.36.7 // indirect
71-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
60+
go.yaml.in/yaml/v2 v2.4.3 // indirect
61+
go.yaml.in/yaml/v3 v3.0.4 // indirect
62+
golang.org/x/net v0.47.0 // indirect
63+
golang.org/x/oauth2 v0.33.0 // indirect
64+
golang.org/x/sys v0.38.0 // indirect
65+
golang.org/x/term v0.37.0 // indirect
66+
golang.org/x/text v0.31.0 // indirect
67+
golang.org/x/time v0.14.0 // indirect
68+
google.golang.org/genproto/googleapis/api v0.0.0-20250811230008-5f3141c8851a // indirect
69+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
70+
google.golang.org/grpc v1.76.0 // indirect
71+
google.golang.org/protobuf v1.36.10 // indirect
72+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
7273
gopkg.in/inf.v0 v0.9.1 // indirect
7374
gopkg.in/yaml.v3 v3.0.1 // indirect
74-
k8s.io/api v0.33.4 // indirect
75-
k8s.io/apiextensions-apiserver v0.33.3 // indirect
76-
k8s.io/apimachinery v0.33.4 // indirect
77-
k8s.io/client-go v0.33.4 // indirect
75+
k8s.io/api v0.34.2 // indirect
76+
k8s.io/apimachinery v0.34.2 // indirect
77+
k8s.io/client-go v0.34.2 // indirect
7878
k8s.io/klog/v2 v2.130.1 // indirect
79-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
80-
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
81-
sigs.k8s.io/controller-runtime v0.21.0 // indirect
82-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
79+
k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 // indirect
80+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
81+
sigs.k8s.io/controller-runtime v0.22.4 // indirect
82+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
8383
sigs.k8s.io/randfill v1.0.0 // indirect
84-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
85-
sigs.k8s.io/yaml v1.4.0 // indirect
84+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
85+
sigs.k8s.io/yaml v1.6.0 // indirect
8686
)

0 commit comments

Comments
 (0)