Skip to content

Commit e9aa093

Browse files
authored
bump controller-runtime (#47)
* bump controller-runtime * bump go * bump k8s.io/cli-runtime * changelog * bump Go to 1.22.2
1 parent ba2c462 commit e9aa093

File tree

7 files changed

+215
-125
lines changed

7 files changed

+215
-125
lines changed

.github/workflows/pull_request.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
pull_request:
99

1010
env:
11-
KUBE_VERSION: v1.28.0
11+
KUBE_VERSION: v1.29.2
1212

1313
jobs:
1414
test:
@@ -22,10 +22,10 @@ jobs:
2222
- uses: actions/checkout@v3
2323
with:
2424
fetch-depth: 0
25-
- name: Set up Go 1.20.6
25+
- name: Set up Go 1.22.2
2626
uses: actions/setup-go@v4
2727
with:
28-
go-version: 1.20.6
28+
go-version: 1.22.2
2929
- uses: actions/cache@v3
3030
with:
3131
path: ~/go/pkg/mod

changelog/v0.7.0/bump-k8s.yaml

+39
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
changelog:
2+
- type: BREAKING_CHANGE
3+
description: >
4+
Bump dependencies to support Kubernetes 1.29
5+
issueLink: https://github.com/solo-io/gloo/issues/8515
6+
resolvesIssue: false
7+
- type: DEPENDENCY_BUMP
8+
dependencyOwner: k8s.io
9+
dependencyRepo: api
10+
dependencyTag: v0.29.2
11+
- type: DEPENDENCY_BUMP
12+
dependencyOwner: k8s.io
13+
dependencyRepo: apiextensions-apiserver
14+
dependencyTag: v0.29.2
15+
- type: DEPENDENCY_BUMP
16+
dependencyOwner: k8s.io
17+
dependencyRepo: apimachinery
18+
dependencyTag: v0.29.2
19+
- type: DEPENDENCY_BUMP
20+
dependencyOwner: k8s.io
21+
dependencyRepo: cli-runtime
22+
dependencyTag: v0.29.2
23+
- type: DEPENDENCY_BUMP
24+
dependencyOwner: k8s.io
25+
dependencyRepo: client-go
26+
dependencyTag: v0.29.2
27+
- type: DEPENDENCY_BUMP
28+
dependencyOwner: sigs.k8s.io
29+
dependencyRepo: controller-runtime
30+
dependencyTag: v0.17.3
31+
- type: DEPENDENCY_BUMP
32+
dependencyOwner: onsi
33+
dependencyRepo: ginkgo/v2
34+
dependencyTag: v2.14.0
35+
- type: DEPENDENCY_BUMP
36+
dependencyOwner: go.uber.org
37+
dependencyRepo: zap
38+
dependencyTag: v1.26.0
39+

debugutils/resources.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func DefaultResourceCollector() (*resourceCollector, error) {
4848
}
4949

5050
httpClient := http.Client{}
51-
restMapper, err := apiutil.NewDiscoveryRESTMapper(cfg, &httpClient)
51+
restMapper, err := apiutil.NewDynamicRESTMapper(cfg, &httpClient)
5252
if err != nil {
5353
return nil, eris.Wrapf(err, "unable to initialize %s", resourceCollectorStr)
5454
}

go.mod

+41-38
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/solo-io/k8s-utils
22

3-
go 1.20
3+
go 1.22.2
44

55
require (
66
github.com/avast/retry-go v2.2.0+incompatible
@@ -13,22 +13,22 @@ require (
1313
github.com/google/uuid v1.3.0
1414
github.com/goph/emperror v0.17.1
1515
github.com/hashicorp/consul/api v1.1.0
16-
github.com/onsi/gomega v1.27.10
16+
github.com/onsi/gomega v1.30.0
1717
github.com/pkg/errors v0.9.1
1818
github.com/rotisserie/eris v0.1.1
1919
github.com/solo-io/go-utils v0.24.8
2020
github.com/spf13/afero v1.6.0
21-
go.uber.org/zap v1.25.0
22-
golang.org/x/sync v0.3.0
23-
google.golang.org/protobuf v1.30.0
21+
go.uber.org/zap v1.26.0
22+
golang.org/x/sync v0.5.0
23+
google.golang.org/protobuf v1.31.0
2424
helm.sh/helm/v3 v3.13.2
25-
k8s.io/api v0.28.3
26-
k8s.io/apiextensions-apiserver v0.28.3
27-
k8s.io/apimachinery v0.28.3
28-
k8s.io/cli-runtime v0.28.3
29-
k8s.io/client-go v0.28.3
30-
sigs.k8s.io/controller-runtime v0.16.3
31-
sigs.k8s.io/yaml v1.3.0
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
31+
sigs.k8s.io/yaml v1.4.0
3232
)
3333

3434
require (
@@ -56,13 +56,13 @@ require (
5656
github.com/docker/go-metrics v0.0.1 // indirect
5757
github.com/docker/go-units v0.5.0 // indirect
5858
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
59-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
59+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
6060
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
6161
github.com/fatih/color v1.13.0 // indirect
6262
github.com/fgrosse/zaptest v1.1.0 // indirect
6363
github.com/go-errors/errors v1.4.2 // indirect
6464
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
65-
github.com/go-logr/logr v1.2.4 // indirect
65+
github.com/go-logr/logr v1.4.1 // indirect
6666
github.com/go-logr/stdr v1.2.2 // indirect
6767
github.com/go-openapi/jsonpointer v0.19.6 // indirect
6868
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -71,12 +71,13 @@ require (
7171
github.com/gobwas/glob v0.2.3 // indirect
7272
github.com/google/btree v1.0.1 // indirect
7373
github.com/google/gnostic-models v0.6.8 // indirect
74-
github.com/google/go-cmp v0.5.9 // indirect
74+
github.com/google/go-cmp v0.6.0 // indirect
7575
github.com/google/go-querystring v1.0.0 // indirect
7676
github.com/google/gofuzz v1.2.0 // indirect
7777
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
7878
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
7979
github.com/gorilla/mux v1.8.0 // indirect
80+
github.com/gorilla/websocket v1.5.0 // indirect
8081
github.com/gosuri/uitable v0.0.4 // indirect
8182
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
8283
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -103,7 +104,7 @@ require (
103104
github.com/mattn/go-colorable v0.1.13 // indirect
104105
github.com/mattn/go-isatty v0.0.17 // indirect
105106
github.com/mattn/go-runewidth v0.0.9 // indirect
106-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
107+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
107108
github.com/mitchellh/copystructure v1.2.0 // indirect
108109
github.com/mitchellh/go-homedir v1.1.0 // indirect
109110
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -117,15 +118,16 @@ require (
117118
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
118119
github.com/morikuni/aec v1.0.0 // indirect
119120
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
121+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
120122
github.com/nxadm/tail v1.4.11 // indirect
121123
github.com/opencontainers/go-digest v1.0.0 // indirect
122124
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
123125
github.com/pelletier/go-toml v1.9.5 // indirect
124126
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
125-
github.com/prometheus/client_golang v1.16.0 // indirect
126-
github.com/prometheus/client_model v0.4.0 // indirect
127-
github.com/prometheus/common v0.44.0 // indirect
128-
github.com/prometheus/procfs v0.10.1 // 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
129131
github.com/rubenv/sql-migrate v1.5.2 // indirect
130132
github.com/russross/blackfriday/v2 v2.1.0 // indirect
131133
github.com/shopspring/decimal v1.3.1 // indirect
@@ -137,42 +139,43 @@ require (
137139
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
138140
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
139141
github.com/xlab/treeprint v1.2.0 // indirect
140-
go.opentelemetry.io/otel v1.14.0 // indirect
141-
go.opentelemetry.io/otel/trace v1.14.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
142145
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
143146
go.uber.org/multierr v1.11.0 // indirect
144-
golang.org/x/crypto v0.14.0 // indirect
145-
golang.org/x/net v0.17.0 // indirect
146-
golang.org/x/oauth2 v0.8.0 // indirect
147-
golang.org/x/sys v0.13.0 // indirect
148-
golang.org/x/term v0.13.0 // indirect
149-
golang.org/x/text v0.13.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
150153
golang.org/x/time v0.3.0 // indirect
151-
golang.org/x/tools v0.9.3 // indirect
154+
golang.org/x/tools v0.16.1 // indirect
152155
google.golang.org/appengine v1.6.7 // indirect
153-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
154-
google.golang.org/grpc v1.56.3 // indirect
156+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
157+
google.golang.org/grpc v1.58.3 // indirect
155158
gopkg.in/inf.v0 v0.9.1 // indirect
156159
gopkg.in/yaml.v2 v2.4.0 // indirect
157160
gopkg.in/yaml.v3 v3.0.1 // indirect
158-
k8s.io/apiserver v0.28.3 // indirect
159-
k8s.io/component-base v0.28.3 // indirect
160-
k8s.io/klog/v2 v2.100.1 // indirect
161-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // 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
162165
k8s.io/kubectl v0.28.2 // indirect
163-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
166+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
164167
oras.land/oras-go v1.2.4 // indirect
165168
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
166169
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
167170
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
168-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
171+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
169172
)
170173

171174
require (
172175
github.com/MakeNowJust/heredoc v1.0.0 // indirect
173176
github.com/bugsnag/bugsnag-go v1.5.0 // indirect
174177
github.com/docker/libtrust v0.0.0-20160708172513-aabc10ec26b7 // indirect
175-
github.com/onsi/ginkgo/v2 v2.11.0
178+
github.com/onsi/ginkgo/v2 v2.14.0
176179
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
177180
github.com/yvasiyarov/gorelic v0.0.6 // indirect
178181
)

0 commit comments

Comments
 (0)