Skip to content

Commit 802ce9a

Browse files
aswinsuryanclaude
andcommitted
NE-2765: Bump Kubernetes to 1.36.2 and Go to 1.26
Bump k8s.io modules to v0.36.2, controller-runtime to v0.24.1, and Go to 1.26. Update openshift/api, openshift/client-go, and openshift/library-go to latest upstream. Update CRD hack script for consolidated DNSNameResolver CRD. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> Signed-off-by: Aswin Suryanarayanan <asuryana@redhat.com>
1 parent 6989515 commit 802ce9a

1,947 files changed

Lines changed: 172905 additions & 152983 deletions

File tree

Some content is hidden

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

go.mod

Lines changed: 63 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
module github.com/openshift/cluster-dns-operator
22

3-
go 1.25.0
3+
go 1.26.0
44

55
require (
66
github.com/apparentlymart/go-cidr v1.1.0
77
github.com/go-logr/logr v1.4.3
88
github.com/google/go-cmp v0.7.0
9-
github.com/openshift/api v0.0.0-20260615110019-261e3a0546f3
9+
github.com/openshift/api v0.0.0-20260721131731-cc7f09f1e582
1010
github.com/openshift/build-machinery-go v0.0.0-20250530140348-dc5b2804eeee
11-
github.com/openshift/client-go v0.0.0-20260317180604-743f664b82d1
11+
github.com/openshift/client-go v0.0.0-20260721124015-35d8f3c0e847
1212
github.com/openshift/coredns-ocp-dnsnameresolver/operator v0.0.0-20260211095308-1a5277b4db1c
13-
github.com/openshift/library-go v0.0.0-20251119174848-88c26bf0df68
13+
github.com/openshift/library-go v0.0.0-20260721103755-0c9fbc9f043a
1414
github.com/sirupsen/logrus v1.9.3
1515
github.com/stretchr/testify v1.11.1
16-
k8s.io/api v0.35.1
17-
k8s.io/apimachinery v0.35.1
18-
k8s.io/client-go v0.35.1
19-
k8s.io/kubectl v0.35.1
20-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
21-
sigs.k8s.io/controller-runtime v0.23.1
16+
k8s.io/api v0.36.2
17+
k8s.io/apimachinery v0.36.2
18+
k8s.io/client-go v0.36.2
19+
k8s.io/kubectl v0.36.2
20+
k8s.io/utils v0.0.0-20260707023825-cf1189d6abe3
21+
sigs.k8s.io/controller-runtime v0.24.1
2222
)
2323

2424
require (
25-
cel.dev/expr v0.24.0 // indirect
25+
cel.dev/expr v0.25.1 // indirect
2626
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2727
github.com/beorn7/perks v1.0.1 // indirect
2828
github.com/blang/semver/v4 v4.0.0 // indirect
29-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
29+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3030
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3131
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
32-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
32+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
3333
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
3434
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
3535
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -39,72 +39,81 @@ require (
3939
github.com/go-logr/zapr v1.3.0 // indirect
4040
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4141
github.com/go-openapi/jsonreference v0.20.2 // indirect
42-
github.com/go-openapi/swag v0.23.0 // indirect
43-
github.com/google/btree v1.1.3 // indirect
42+
github.com/go-openapi/swag v0.25.4 // indirect
43+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
44+
github.com/go-openapi/swag/conv v0.25.4 // indirect
45+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
46+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
47+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
48+
github.com/go-openapi/swag/loading v0.25.4 // indirect
49+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
50+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
51+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
52+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
53+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
4454
github.com/google/cel-go v0.26.0 // indirect
4555
github.com/google/gnostic-models v0.7.0 // indirect
4656
github.com/google/uuid v1.6.0 // indirect
47-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
57+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
4858
github.com/imdario/mergo v0.3.12 // indirect
4959
github.com/inconshreveable/mousetrap v1.1.0 // indirect
50-
github.com/josharian/intern v1.0.0 // indirect
5160
github.com/json-iterator/go v1.1.12 // indirect
52-
github.com/mailru/easyjson v0.7.7 // indirect
5361
github.com/miekg/dns v1.1.58 // indirect
5462
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5563
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5664
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5765
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5866
github.com/prometheus/client_golang v1.23.2 // indirect
5967
github.com/prometheus/client_model v0.6.2 // indirect
60-
github.com/prometheus/common v0.66.1 // indirect
61-
github.com/prometheus/procfs v0.16.1 // indirect
68+
github.com/prometheus/common v0.67.5 // indirect
69+
github.com/prometheus/procfs v0.19.2 // indirect
6270
github.com/robfig/cron v1.2.0 // indirect
63-
github.com/spf13/cobra v1.10.0 // indirect
64-
github.com/spf13/pflag v1.0.9 // indirect
71+
github.com/spf13/cobra v1.10.2 // indirect
72+
github.com/spf13/pflag v1.0.10 // indirect
6573
github.com/stoewer/go-strcase v1.3.0 // indirect
6674
github.com/x448/float16 v0.8.4 // indirect
67-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
68-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
69-
go.opentelemetry.io/otel v1.36.0 // indirect
70-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
71-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
72-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
73-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
74-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
75-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
75+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
76+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
77+
go.opentelemetry.io/otel v1.43.0 // indirect
78+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
79+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
80+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
81+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
82+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
83+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
7684
go.uber.org/multierr v1.11.0 // indirect
77-
go.uber.org/zap v1.27.0 // indirect
85+
go.uber.org/zap v1.27.1 // indirect
7886
go.yaml.in/yaml/v2 v2.4.3 // indirect
7987
go.yaml.in/yaml/v3 v3.0.4 // indirect
80-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
81-
golang.org/x/mod v0.29.0 // indirect
82-
golang.org/x/net v0.47.0 // indirect
83-
golang.org/x/oauth2 v0.30.0 // indirect
84-
golang.org/x/sync v0.18.0 // indirect
85-
golang.org/x/sys v0.38.0 // indirect
86-
golang.org/x/term v0.37.0 // indirect
87-
golang.org/x/text v0.31.0 // indirect
88-
golang.org/x/time v0.9.0 // indirect
89-
golang.org/x/tools v0.38.0 // indirect
88+
golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect
89+
golang.org/x/mod v0.35.0 // indirect
90+
golang.org/x/net v0.55.1-0.20260602153038-42abb857022c // indirect
91+
golang.org/x/oauth2 v0.34.0 // indirect
92+
golang.org/x/sync v0.20.0 // indirect
93+
golang.org/x/sys v0.45.0 // indirect
94+
golang.org/x/term v0.43.0 // indirect
95+
golang.org/x/text v0.37.0 // indirect
96+
golang.org/x/time v0.15.0 // indirect
97+
golang.org/x/tools v0.44.0 // indirect
9098
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
91-
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
92-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
93-
google.golang.org/grpc v1.72.2 // indirect
94-
google.golang.org/protobuf v1.36.8 // indirect
99+
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
100+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
101+
google.golang.org/grpc v1.79.3 // indirect
102+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
95103
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
96104
gopkg.in/inf.v0 v0.9.1 // indirect
97105
gopkg.in/yaml.v3 v3.0.1 // indirect
98-
k8s.io/apiextensions-apiserver v0.35.1 // indirect
99-
k8s.io/apiserver v0.35.1 // indirect
100-
k8s.io/component-base v0.35.1 // indirect
101-
k8s.io/klog/v2 v2.130.1 // indirect
102-
k8s.io/kube-aggregator v0.35.1 // indirect
103-
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
104-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
106+
k8s.io/apiextensions-apiserver v0.36.2 // indirect
107+
k8s.io/apiserver v0.36.2 // indirect
108+
k8s.io/component-base v0.36.2 // indirect
109+
k8s.io/klog/v2 v2.140.0 // indirect
110+
k8s.io/kube-aggregator v0.36.2 // indirect
111+
k8s.io/kube-openapi v0.0.0-20260519202549-bbf5c5577288 // indirect
112+
k8s.io/streaming v0.36.2 // indirect
113+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
105114
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
106115
sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
107116
sigs.k8s.io/randfill v1.0.0 // indirect
108-
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
117+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
109118
sigs.k8s.io/yaml v1.6.0 // indirect
110119
)

0 commit comments

Comments
 (0)