Skip to content

Commit dd4a349

Browse files
authored
go 1.23/k8s 1.31 (#53)
Signed-off-by: Tyler Schade <[email protected]>
1 parent 41d59af commit dd4a349

File tree

3 files changed

+221
-168
lines changed

3 files changed

+221
-168
lines changed

changelog/v0.8.0/k8s-1.31.yaml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
changelog:
2+
- type: BREAKING_CHANGE
3+
description: >
4+
Bump dependencies to support Kubernetes 1.31 and go1.23
5+
issueLink: https://github.com/solo-io/gloo/issues/9683
6+
resolvesIssue: false
7+
- type: DEPENDENCY_BUMP
8+
dependencyOwner: k8s.io
9+
dependencyRepo: api
10+
dependencyTag: v0.31.0
11+
- type: DEPENDENCY_BUMP
12+
dependencyOwner: golang
13+
dependencyRepo: protobuf
14+
dependencyTag: v1.5.4
15+
- type: DEPENDENCY_BUMP
16+
dependencyOwner: google
17+
dependencyRepo: uuid
18+
dependencyTag: v1.6.0
19+
- type: DEPENDENCY_BUMP
20+
dependencyOwner: onsi
21+
dependencyRepo: gomega
22+
dependencyTag: v1.33.1
23+
- type: DEPENDENCY_BUMP
24+
dependencyOwner: solo-io
25+
dependencyRepo: go-utils
26+
dependencyTag: v0.26.0
27+
- type: DEPENDENCY_BUMP
28+
dependencyOwner: golang
29+
dependencyRepo: x/sync
30+
dependencyTag: v0.8.0
31+
- type: DEPENDENCY_BUMP
32+
dependencyOwner: google
33+
dependencyRepo: protobuf
34+
dependencyTag: v1.34.2
35+
- type: DEPENDENCY_BUMP
36+
dependencyOwner: k8s.io
37+
dependencyRepo: apimachinery
38+
dependencyTag: v0.31.0
39+
- type: DEPENDENCY_BUMP
40+
dependencyOwner: k8s.io
41+
dependencyRepo: apiextensions-apiserver
42+
dependencyTag: v0.31.0
43+
- type: DEPENDENCY_BUMP
44+
dependencyOwner: k8s.io
45+
dependencyRepo: client-go
46+
dependencyTag: v0.31.0
47+
- type: DEPENDENCY_BUMP
48+
dependencyOwner: k8s.io
49+
dependencyRepo: cli-runtime
50+
dependencyTag: v0.31.0
51+
- type: DEPENDENCY_BUMP
52+
dependencyOwner: sigs.k8s.io
53+
dependencyRepo: controller-runtime
54+
dependencyTag: v0.19.0
55+

go.mod

+51-49
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
module github.com/solo-io/k8s-utils
22

3-
go 1.22.2
3+
go 1.23.0
44

55
require (
66
github.com/avast/retry-go v2.2.0+incompatible
77
github.com/evanphx/json-patch v5.6.0+incompatible
88
github.com/ghodss/yaml v1.0.0
99
github.com/gogo/protobuf v1.3.2
1010
github.com/golang/mock v1.6.0
11-
github.com/golang/protobuf v1.5.3
11+
github.com/golang/protobuf v1.5.4
1212
github.com/google/go-github/v32 v32.0.0
13-
github.com/google/uuid v1.3.0
13+
github.com/google/uuid v1.6.0
1414
github.com/goph/emperror v0.17.1
1515
github.com/hashicorp/consul/api v1.1.0
16-
github.com/onsi/gomega v1.30.0
16+
github.com/onsi/gomega v1.33.1
1717
github.com/pkg/errors v0.9.1
1818
github.com/rotisserie/eris v0.1.1
19-
github.com/solo-io/go-utils v0.24.8
19+
github.com/solo-io/go-utils v0.26.0
2020
github.com/spf13/afero v1.6.0
2121
go.uber.org/zap v1.26.0
22-
golang.org/x/sync v0.5.0
23-
google.golang.org/protobuf v1.31.0
22+
golang.org/x/sync v0.8.0
23+
google.golang.org/protobuf v1.34.2
2424
helm.sh/helm/v3 v3.13.2
25-
k8s.io/api v0.29.2
26-
k8s.io/apiextensions-apiserver v0.29.2
27-
k8s.io/apimachinery v0.29.2
28-
k8s.io/cli-runtime v0.29.2
29-
k8s.io/client-go v0.29.2
30-
sigs.k8s.io/controller-runtime v0.17.3
25+
k8s.io/api v0.31.0
26+
k8s.io/apiextensions-apiserver v0.31.0
27+
k8s.io/apimachinery v0.31.0
28+
k8s.io/cli-runtime v0.31.0
29+
k8s.io/client-go v0.31.0
30+
sigs.k8s.io/controller-runtime v0.19.0
3131
sigs.k8s.io/yaml v1.4.0
3232
)
3333

@@ -43,11 +43,12 @@ require (
4343
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect
4444
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
4545
github.com/beorn7/perks v1.0.1 // indirect
46-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
46+
github.com/blang/semver/v4 v4.0.0 // indirect
47+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4748
github.com/chai2010/gettext-go v1.0.2 // indirect
4849
github.com/containerd/containerd v1.7.6 // indirect
4950
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
50-
github.com/davecgh/go-spew v1.1.1 // indirect
51+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5152
github.com/docker/cli v24.0.6+incompatible // indirect
5253
github.com/docker/distribution v2.8.2+incompatible // indirect
5354
github.com/docker/docker v24.0.7+incompatible // indirect
@@ -56,25 +57,26 @@ require (
5657
github.com/docker/go-metrics v0.0.1 // indirect
5758
github.com/docker/go-units v0.5.0 // indirect
5859
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
59-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
60+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
6061
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
6162
github.com/fatih/color v1.13.0 // indirect
6263
github.com/fgrosse/zaptest v1.1.0 // indirect
64+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
6365
github.com/go-errors/errors v1.4.2 // indirect
6466
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
65-
github.com/go-logr/logr v1.4.1 // indirect
67+
github.com/go-logr/logr v1.4.2 // indirect
6668
github.com/go-logr/stdr v1.2.2 // indirect
6769
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6870
github.com/go-openapi/jsonreference v0.20.2 // indirect
69-
github.com/go-openapi/swag v0.22.3 // indirect
70-
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
71+
github.com/go-openapi/swag v0.22.4 // indirect
72+
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
7173
github.com/gobwas/glob v0.2.3 // indirect
7274
github.com/google/btree v1.0.1 // indirect
7375
github.com/google/gnostic-models v0.6.8 // indirect
7476
github.com/google/go-cmp v0.6.0 // indirect
7577
github.com/google/go-querystring v1.0.0 // indirect
7678
github.com/google/gofuzz v1.2.0 // indirect
77-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
79+
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
7880
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
7981
github.com/gorilla/mux v1.8.0 // indirect
8082
github.com/gorilla/websocket v1.5.0 // indirect
@@ -104,14 +106,13 @@ require (
104106
github.com/mattn/go-colorable v0.1.13 // indirect
105107
github.com/mattn/go-isatty v0.0.17 // indirect
106108
github.com/mattn/go-runewidth v0.0.9 // indirect
107-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
108109
github.com/mitchellh/copystructure v1.2.0 // indirect
109110
github.com/mitchellh/go-homedir v1.1.0 // indirect
110111
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
111112
github.com/mitchellh/mapstructure v1.5.0 // indirect
112113
github.com/mitchellh/reflectwalk v1.0.2 // indirect
113114
github.com/moby/locker v1.0.1 // indirect
114-
github.com/moby/spdystream v0.2.0 // indirect
115+
github.com/moby/spdystream v0.4.0 // indirect
115116
github.com/moby/term v0.5.0 // indirect
116117
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
117118
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -124,58 +125,59 @@ require (
124125
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
125126
github.com/pelletier/go-toml v1.9.5 // indirect
126127
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
127-
github.com/prometheus/client_golang v1.18.0 // indirect
128-
github.com/prometheus/client_model v0.5.0 // indirect
129-
github.com/prometheus/common v0.45.0 // indirect
130-
github.com/prometheus/procfs v0.12.0 // indirect
128+
github.com/prometheus/client_golang v1.19.1 // indirect
129+
github.com/prometheus/client_model v0.6.1 // indirect
130+
github.com/prometheus/common v0.55.0 // indirect
131+
github.com/prometheus/procfs v0.15.1 // indirect
131132
github.com/rubenv/sql-migrate v1.5.2 // indirect
132133
github.com/russross/blackfriday/v2 v2.1.0 // indirect
133134
github.com/shopspring/decimal v1.3.1 // indirect
134135
github.com/sirupsen/logrus v1.9.3 // indirect
135136
github.com/spf13/cast v1.5.0 // indirect
136-
github.com/spf13/cobra v1.7.0 // indirect
137+
github.com/spf13/cobra v1.8.1 // indirect
137138
github.com/spf13/pflag v1.0.5 // indirect
139+
github.com/x448/float16 v0.8.4 // indirect
138140
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
139141
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
140142
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
141143
github.com/xlab/treeprint v1.2.0 // indirect
142-
go.opentelemetry.io/otel v1.19.0 // indirect
143-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
144-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
144+
go.opentelemetry.io/otel v1.28.0 // indirect
145+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
146+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
145147
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
146148
go.uber.org/multierr v1.11.0 // indirect
147-
golang.org/x/crypto v0.16.0 // indirect
148-
golang.org/x/net v0.19.0 // indirect
149-
golang.org/x/oauth2 v0.12.0 // indirect
150-
golang.org/x/sys v0.16.0 // indirect
151-
golang.org/x/term v0.15.0 // indirect
152-
golang.org/x/text v0.14.0 // indirect
149+
golang.org/x/crypto v0.26.0 // indirect
150+
golang.org/x/net v0.26.0 // indirect
151+
golang.org/x/oauth2 v0.21.0 // indirect
152+
golang.org/x/sys v0.24.0 // indirect
153+
golang.org/x/term v0.23.0 // indirect
154+
golang.org/x/text v0.17.0 // indirect
153155
golang.org/x/time v0.3.0 // indirect
154-
golang.org/x/tools v0.16.1 // indirect
155-
google.golang.org/appengine v1.6.7 // indirect
156-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
157-
google.golang.org/grpc v1.58.3 // indirect
156+
golang.org/x/tools v0.22.0 // indirect
157+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
158+
google.golang.org/grpc v1.65.0 // indirect
159+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
158160
gopkg.in/inf.v0 v0.9.1 // indirect
159161
gopkg.in/yaml.v2 v2.4.0 // indirect
160162
gopkg.in/yaml.v3 v3.0.1 // indirect
161-
k8s.io/apiserver v0.29.2 // indirect
162-
k8s.io/component-base v0.29.2 // indirect
163-
k8s.io/klog/v2 v2.110.1 // indirect
164-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
165-
k8s.io/kubectl v0.28.2 // indirect
166-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
163+
k8s.io/apiserver v0.31.0 // indirect
164+
k8s.io/component-base v0.31.0 // indirect
165+
k8s.io/klog/v2 v2.130.1 // indirect
166+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
167+
k8s.io/kubectl v0.31.0 // indirect
168+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
167169
oras.land/oras-go v1.2.4 // indirect
168170
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
169-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
170-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
171+
sigs.k8s.io/kustomize/api v0.17.2 // indirect
172+
sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
171173
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
172174
)
173175

174176
require (
175177
github.com/MakeNowJust/heredoc v1.0.0 // indirect
176178
github.com/bugsnag/bugsnag-go v1.5.0 // indirect
177179
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
178-
github.com/onsi/ginkgo/v2 v2.14.0
180+
github.com/onsi/ginkgo/v2 v2.19.0
179181
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
180182
github.com/yvasiyarov/gorelic v0.0.6 // indirect
181183
)

0 commit comments

Comments
 (0)