Skip to content

Commit 6e08bca

Browse files
chrisohaverchrisohaver
authored
Give k8s test Endpoint addresses hostnames (#159)
* give Endpoint addresses hostnames in tests * update endpoint name changes in test expectations * fix AXFR test expectations Signed-off-by: Chris O'Haver <cohaver@infoblox.com>
1 parent 88bcbeb commit 6e08bca

File tree

7 files changed

+174
-138
lines changed

7 files changed

+174
-138
lines changed

‎build/kubernetes/dns-test.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ metadata:
124124
subsets:
125125
- addresses:
126126
- ip: 172.17.0.253
127+
hostname: svc-1-a
127128
ports:
128129
- port: 80
129130
name: http
@@ -208,6 +209,7 @@ metadata:
208209
subsets:
209210
- addresses:
210211
- ip: 172.17.0.252
212+
hostname: svc-d
211213
ports:
212214
- port: 1234
213215
name: c-port
@@ -233,9 +235,13 @@ metadata:
233235
subsets:
234236
- addresses:
235237
- ip: 172.17.0.255
238+
hostname: headless-svc-1
236239
- ip: 172.17.0.254
240+
hostname: headless-svc-2
237241
- ip: 1234:abcd::1
242+
hostname: headless-svc-3
238243
- ip: 1234:abcd::2
244+
hostname: headless-svc-4
239245
ports:
240246
- port: 1234
241247
name: c-port
@@ -430,6 +436,7 @@ metadata:
430436
subsets:
431437
- addresses:
432438
- ip: 172.17.0.251
439+
hostname: svc-1-a
433440
ports:
434441
- port: 80
435442
name: http
@@ -500,9 +507,13 @@ metadata:
500507
subsets:
501508
- addresses:
502509
- ip: 172.17.0.250
510+
hostname: headless-svc-1
503511
- ip: 172.17.0.249
512+
hostname: headless-svc-2
504513
- ip: 1234:abcd::3
514+
hostname: headless-svc-3
505515
- ip: 1234:abcd::4
516+
hostname: headless-svc-4
506517
ports:
507518
- port: 1234
508519
name: c-port

‎go.mod‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
module github.com/coredns/ci
22

3-
go 1.21
3+
go 1.22.0
44

5-
toolchain go1.22.3
5+
toolchain go1.23.0
66

77
require (
88
github.com/coredns/caddy v1.1.1
99
github.com/coredns/coredns v0.0.0
10-
github.com/miekg/dns v1.1.59
11-
github.com/prometheus/common v0.55.0
12-
k8s.io/api v0.29.3
13-
k8s.io/apimachinery v0.29.3
14-
k8s.io/client-go v0.29.3
10+
github.com/miekg/dns v1.1.62
11+
github.com/prometheus/common v0.59.1
12+
k8s.io/api v0.31.1
13+
k8s.io/apimachinery v0.31.1
14+
k8s.io/client-go v0.31.1
1515
)
1616

1717
require (
18-
cloud.google.com/go/auth v0.9.1 // indirect
18+
cloud.google.com/go/auth v0.9.4 // indirect
1919
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
20-
cloud.google.com/go/compute/metadata v0.5.0 // indirect
20+
cloud.google.com/go/compute/metadata v0.5.1 // indirect
2121
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
2222
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
2323
github.com/Azure/go-autorest/autorest v0.11.29 // indirect
@@ -36,7 +36,6 @@ require (
3636
github.com/DataDog/go-tuf v1.0.2-0.5.2 // indirect
3737
github.com/DataDog/sketches-go v1.4.5 // indirect
3838
github.com/Microsoft/go-winio v0.6.1 // indirect
39-
github.com/antonmedv/expr v1.15.5 // indirect
4039
github.com/apparentlymart/go-cidr v1.1.0 // indirect
4140
github.com/aws/aws-sdk-go v1.55.5 // indirect
4241
github.com/beorn7/perks v1.0.1 // indirect
@@ -50,9 +49,11 @@ require (
5049
github.com/dustin/go-humanize v1.0.1 // indirect
5150
github.com/ebitengine/purego v0.6.0-alpha.5 // indirect
5251
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
52+
github.com/expr-lang/expr v1.16.9 // indirect
5353
github.com/farsightsec/golang-framestream v0.3.0 // indirect
5454
github.com/felixge/httpsnoop v1.0.4 // indirect
5555
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
56+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
5657
github.com/go-logr/logr v1.4.2 // indirect
5758
github.com/go-logr/stdr v1.2.2 // indirect
5859
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -66,10 +67,10 @@ require (
6667
github.com/google/gnostic-models v0.6.8 // indirect
6768
github.com/google/go-cmp v0.6.0 // indirect
6869
github.com/google/gofuzz v1.2.0 // indirect
69-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
70+
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
7071
github.com/google/s2a-go v0.1.8 // indirect
7172
github.com/google/uuid v1.6.0 // indirect
72-
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
73+
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
7374
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
7475
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect
7576
github.com/imdario/mergo v0.3.13 // indirect
@@ -84,8 +85,7 @@ require (
8485
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8586
github.com/modern-go/reflect2 v1.0.2 // indirect
8687
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
87-
github.com/onsi/ginkgo/v2 v2.17.2 // indirect
88-
github.com/onsi/gomega v1.33.1 // indirect
88+
github.com/onsi/ginkgo/v2 v2.19.0 // indirect
8989
github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492 // indirect
9090
github.com/opentracing/opentracing-go v1.2.0 // indirect
9191
github.com/openzipkin-contrib/zipkin-go-opentracing v0.5.0 // indirect
@@ -95,48 +95,49 @@ require (
9595
github.com/outcaste-io/ristretto v0.2.3 // indirect
9696
github.com/philhofer/fwd v1.1.2 // indirect
9797
github.com/pkg/errors v0.9.1 // indirect
98-
github.com/prometheus/client_golang v1.20.2 // indirect
98+
github.com/prometheus/client_golang v1.20.4 // indirect
9999
github.com/prometheus/client_model v0.6.1 // indirect
100100
github.com/prometheus/procfs v0.15.1 // indirect
101-
github.com/quic-go/quic-go v0.42.0 // indirect
101+
github.com/quic-go/quic-go v0.47.0 // indirect
102102
github.com/secure-systems-lab/go-securesystemslib v0.7.0 // indirect
103103
github.com/spf13/pflag v1.0.5 // indirect
104104
github.com/tinylib/msgp v1.1.8 // indirect
105-
go.etcd.io/etcd/api/v3 v3.5.15 // indirect
106-
go.etcd.io/etcd/client/pkg/v3 v3.5.15 // indirect
107-
go.etcd.io/etcd/client/v3 v3.5.15 // indirect
105+
github.com/x448/float16 v0.8.4 // indirect
106+
go.etcd.io/etcd/api/v3 v3.5.16 // indirect
107+
go.etcd.io/etcd/client/pkg/v3 v3.5.16 // indirect
108+
go.etcd.io/etcd/client/v3 v3.5.16 // indirect
108109
go.opencensus.io v0.24.0 // indirect
109-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
110-
go.opentelemetry.io/otel v1.24.0 // indirect
111-
go.opentelemetry.io/otel/metric v1.24.0 // indirect
112-
go.opentelemetry.io/otel/trace v1.24.0 // indirect
110+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
111+
go.opentelemetry.io/otel v1.29.0 // indirect
112+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
113+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
113114
go.uber.org/atomic v1.11.0 // indirect
114115
go.uber.org/mock v0.4.0 // indirect
115116
go.uber.org/multierr v1.6.0 // indirect
116117
go.uber.org/zap v1.19.0 // indirect
117-
golang.org/x/crypto v0.26.0 // indirect
118-
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
118+
golang.org/x/crypto v0.27.0 // indirect
119+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
119120
golang.org/x/mod v0.18.0 // indirect
120-
golang.org/x/net v0.28.0 // indirect
121-
golang.org/x/oauth2 v0.22.0 // indirect
121+
golang.org/x/net v0.29.0 // indirect
122+
golang.org/x/oauth2 v0.23.0 // indirect
122123
golang.org/x/sync v0.8.0 // indirect
123-
golang.org/x/sys v0.24.0 // indirect
124-
golang.org/x/term v0.23.0 // indirect
125-
golang.org/x/text v0.17.0 // indirect
124+
golang.org/x/sys v0.25.0 // indirect
125+
golang.org/x/term v0.24.0 // indirect
126+
golang.org/x/text v0.18.0 // indirect
126127
golang.org/x/time v0.6.0 // indirect
127128
golang.org/x/tools v0.22.0 // indirect
128129
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
129-
google.golang.org/api v0.194.0 // indirect
130-
google.golang.org/genproto/googleapis/api v0.0.0-20240730163845-b1a4ccb954bf // indirect
131-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
132-
google.golang.org/grpc v1.65.0 // indirect
130+
google.golang.org/api v0.198.0 // indirect
131+
google.golang.org/genproto/googleapis/api v0.0.0-20240827150818-7e3bb234dfed // indirect
132+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
133+
google.golang.org/grpc v1.67.0 // indirect
133134
google.golang.org/protobuf v1.34.2 // indirect
134-
gopkg.in/DataDog/dd-trace-go.v1 v1.67.0 // indirect
135+
gopkg.in/DataDog/dd-trace-go.v1 v1.68.0 // indirect
135136
gopkg.in/inf.v0 v0.9.1 // indirect
136137
gopkg.in/yaml.v2 v2.4.0 // indirect
137138
gopkg.in/yaml.v3 v3.0.1 // indirect
138139
k8s.io/klog/v2 v2.130.1 // indirect
139-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
140+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
140141
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
141142
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
142143
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)