Skip to content

Commit 40f5335

Browse files
authored
Bump k8s.io/client-go past v0.27.0 including transitively (#264)
When I ran `go mod graph | grep client-go` after the merge of: - #263 I saw that our direct dependencies were still using `v0.25.X` of `k8s.io/client-go` (transitively.) e.g. ``` github.com/prometheus/prometheus@v0.39.1 k8s.io/client-go@v0.25.1 k8s.io/apiextensions-apiserver@v0.25.3 k8s.io/client-go@v0.25.3 k8s.io/cli-runtime@v0.25.3 k8s.io/client-go@v0.25.3 k8s.io/component-base@v0.25.3 k8s.io/client-go@v0.25.3 sigs.k8s.io/controller-runtime@v0.13.1 k8s.io/client-go@v0.25.0 ``` We need a more recent version of client-go all throughout the stack to support: #262 So this is my attempt to upgrade all dependencies which use client-go transitively. I'm not too strong in golang dependency management, so if I shouldn't have done it this way, please let me know!! Is there another smarter way to force all transitive declarations of a particular dependency to be of a minimum version? I ran: ``` go get -u sigs.k8s.io/controller-runtime go get -u github.com/prometheus/prometheus go get -u k8s.io/apiextensions-apiserver go get -u k8s.io/cli-runtime go mod tidy ``` Then `go mod graph | grep client-go` gives something which makes it seem like `client-go` got upgraded all throughout the dependency tree: ``` github.com/googlecloudrobotics/core/src k8s.io/client-go@v0.28.4 github.com/prometheus/prometheus@v0.48.0 k8s.io/client-go@v0.28.2 k8s.io/apiextensions-apiserver@v0.28.4 k8s.io/client-go@v0.28.4 k8s.io/cli-runtime@v0.28.4 k8s.io/client-go@v0.28.4 k8s.io/client-go@v0.28.4 github.com/evanphx/json-patch@v4.12.0+incompatible k8s.io/client-go@v0.28.4 github.com/gogo/protobuf@v1.3.2 k8s.io/client-go@v0.28.4 github.com/golang/groupcache@v0.0.0-20210331224755-41bb18bfe9da k8s.io/client-go@v0.28.4 github.com/golang/protobuf@v1.5.3 k8s.io/client-go@v0.28.4 github.com/google/gnostic-models@v0.6.8 k8s.io/client-go@v0.28.4 github.com/google/go-cmp@v0.5.9 k8s.io/client-go@v0.28.4 github.com/google/gofuzz@v1.2.0 k8s.io/client-go@v0.28.4 github.com/google/uuid@v1.3.0 k8s.io/client-go@v0.28.4 github.com/gregjones/httpcache@v0.0.0-20180305231024-9cad4c3443a7 k8s.io/client-go@v0.28.4 github.com/imdario/mergo@v0.3.6 k8s.io/client-go@v0.28.4 github.com/peterbourgon/diskv@v2.0.1+incompatible k8s.io/client-go@v0.28.4 github.com/spf13/pflag@v1.0.5 k8s.io/client-go@v0.28.4 github.com/stretchr/testify@v1.8.2 k8s.io/client-go@v0.28.4 golang.org/x/net@v0.17.0 k8s.io/client-go@v0.28.4 golang.org/x/oauth2@v0.8.0 k8s.io/client-go@v0.28.4 golang.org/x/term@v0.13.0 k8s.io/client-go@v0.28.4 golang.org/x/time@v0.3.0 k8s.io/client-go@v0.28.4 google.golang.org/protobuf@v1.31.0 k8s.io/client-go@v0.28.4 k8s.io/api@v0.28.4 k8s.io/client-go@v0.28.4 k8s.io/apimachinery@v0.28.4 k8s.io/client-go@v0.28.4 k8s.io/klog/v2@v2.100.1 k8s.io/client-go@v0.28.4 k8s.io/kube-openapi@v0.0.0-20230717233707-2695361300d9 k8s.io/client-go@v0.28.4 k8s.io/utils@v0.0.0-20230406110748-d93618cff8a2 k8s.io/client-go@v0.28.4 sigs.k8s.io/json@v0.0.0-20221116044647-bc3834ca7abd k8s.io/client-go@v0.28.4 sigs.k8s.io/structured-merge-diff/v4@v4.2.3 k8s.io/client-go@v0.28.4 sigs.k8s.io/yaml@v1.3.0 k8s.io/client-go@v0.28.4 github.com/davecgh/go-spew@v1.1.1 k8s.io/client-go@v0.28.4 github.com/emicklei/go-restful/v3@v3.9.0 k8s.io/client-go@v0.28.4 github.com/go-logr/logr@v1.2.4 k8s.io/client-go@v0.28.4 github.com/go-openapi/jsonpointer@v0.19.6 k8s.io/client-go@v0.28.4 github.com/go-openapi/jsonreference@v0.20.2 k8s.io/client-go@v0.28.4 github.com/go-openapi/swag@v0.22.3 k8s.io/client-go@v0.28.4 github.com/google/btree@v1.0.1 k8s.io/client-go@v0.28.4 github.com/josharian/intern@v1.0.0 k8s.io/client-go@v0.28.4 github.com/json-iterator/go@v1.1.12 k8s.io/client-go@v0.28.4 github.com/mailru/easyjson@v0.7.7 k8s.io/client-go@v0.28.4 github.com/moby/spdystream@v0.2.0 k8s.io/client-go@v0.28.4 github.com/modern-go/concurrent@v0.0.0-20180306012644-bacd9c7ef1dd k8s.io/client-go@v0.28.4 github.com/modern-go/reflect2@v1.0.2 k8s.io/client-go@v0.28.4 github.com/munnerz/goautoneg@v0.0.0-20191010083416-a7dc8b61c822 k8s.io/client-go@v0.28.4 github.com/onsi/gomega@v1.27.6 k8s.io/client-go@v0.28.4 github.com/pkg/errors@v0.9.1 k8s.io/client-go@v0.28.4 github.com/pmezard/go-difflib@v1.0.0 k8s.io/client-go@v0.28.4 golang.org/x/sys@v0.13.0 k8s.io/client-go@v0.28.4 golang.org/x/text@v0.13.0 k8s.io/client-go@v0.28.4 google.golang.org/appengine@v1.6.7 k8s.io/client-go@v0.28.4 gopkg.in/inf.v0@v0.9.1 k8s.io/client-go@v0.28.4 gopkg.in/yaml.v2@v2.4.0 k8s.io/client-go@v0.28.4 gopkg.in/yaml.v3@v3.0.1 k8s.io/component-base@v0.28.4 k8s.io/client-go@v0.28.4 sigs.k8s.io/controller-runtime@v0.16.3 k8s.io/client-go@v0.28.3 ``` I understand this is a large scale change, so I would be open to answering any questions! Signed-off-by: methylDragon <methylDragon@google.com>
1 parent efe2bf1 commit 40f5335

File tree

2 files changed

+224
-302
lines changed

2 files changed

+224
-302
lines changed

src/go.mod

Lines changed: 66 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ module github.com/googlecloudrobotics/core/src
33
go 1.21
44

55
require (
6-
cloud.google.com/go v0.110.0 // indirect
6+
cloud.google.com/go v0.110.10 // indirect
77
contrib.go.opencensus.io/exporter/prometheus v0.4.2
88
contrib.go.opencensus.io/exporter/stackdriver v0.13.14
99
github.com/Masterminds/goutils v1.1.1 // indirect
1010
github.com/Masterminds/semver v1.5.0 // indirect
1111
github.com/Masterminds/sprig v2.22.0+incompatible // indirect
1212
github.com/cenkalti/backoff v2.2.1+incompatible
1313
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
14-
github.com/fsnotify/fsnotify v1.6.0
14+
github.com/fsnotify/fsnotify v1.7.0
1515
github.com/getlantern/httptest v0.0.0-20161025015934-4b40f4c7e590
1616
github.com/getlantern/mockconn v0.0.0-20190403061815-a8ffa60494a6 // indirect
1717
github.com/gobwas/glob v0.2.3 // indirect
@@ -22,133 +22,127 @@ require (
2222
github.com/mitchellh/reflectwalk v1.0.2 // indirect
2323
github.com/motemen/go-loghttp v0.0.0-20170804080138-974ac5ceac27
2424
github.com/motemen/go-nuts v0.0.0-20220604134737-2658d0104f31 // indirect
25-
github.com/onsi/gomega v1.27.6
25+
github.com/onsi/gomega v1.27.10
2626
github.com/pkg/errors v0.9.1
27-
github.com/prometheus/client_golang v1.13.1
28-
github.com/prometheus/procfs v0.8.0 // indirect
29-
github.com/spf13/cobra v1.6.1
27+
github.com/prometheus/client_golang v1.17.0
28+
github.com/prometheus/procfs v0.12.0 // indirect
29+
github.com/spf13/cobra v1.8.0
3030
github.com/spf13/pflag v1.0.5
3131
go.opencensus.io v0.24.0
32-
golang.org/x/crypto v0.14.0
33-
golang.org/x/net v0.17.0
34-
golang.org/x/sync v0.2.0
35-
golang.org/x/sys v0.13.0 // indirect
36-
google.golang.org/api v0.128.0
37-
google.golang.org/grpc v1.56.3
32+
golang.org/x/crypto v0.16.0
33+
golang.org/x/net v0.19.0
34+
golang.org/x/sync v0.5.0
35+
golang.org/x/sys v0.15.0 // indirect
36+
google.golang.org/api v0.149.0
37+
google.golang.org/grpc v1.59.0
3838
google.golang.org/protobuf v1.31.0
3939
gopkg.in/h2non/gock.v1 v1.1.2
4040
k8s.io/api v0.28.4
41-
k8s.io/apiextensions-apiserver v0.25.3
41+
k8s.io/apiextensions-apiserver v0.28.4
4242
k8s.io/apimachinery v0.28.4
43-
k8s.io/cli-runtime v0.25.3
43+
k8s.io/cli-runtime v0.28.4
4444
k8s.io/client-go v0.28.4
4545
k8s.io/helm v2.17.0+incompatible
4646
k8s.io/klog v1.0.0
47-
sigs.k8s.io/controller-runtime v0.13.1
47+
sigs.k8s.io/controller-runtime v0.16.3
4848
sigs.k8s.io/kind v0.17.0
49-
sigs.k8s.io/yaml v1.3.0
49+
sigs.k8s.io/yaml v1.4.0
5050
)
5151

5252
require (
53-
cloud.google.com/go/storage v1.28.1
54-
github.com/aws/aws-sdk-go v1.44.129 // indirect
53+
cloud.google.com/go/storage v1.30.1
54+
github.com/aws/aws-sdk-go v1.45.25 // indirect
5555
github.com/cespare/xxhash/v2 v2.2.0 // indirect
5656
github.com/prometheus/statsd_exporter v0.22.8 // indirect
57-
golang.org/x/oauth2 v0.8.0
58-
google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
57+
golang.org/x/oauth2 v0.15.0
58+
google.golang.org/genproto v0.0.0-20231127180814-3a041ad873d4 // indirect
5959
)
6060

6161
require (
6262
github.com/form3tech-oss/jwt-go v3.2.5+incompatible
63-
github.com/golang/glog v1.1.0
64-
github.com/google/go-cmp v0.5.9
63+
github.com/golang/glog v1.1.2
64+
github.com/google/go-cmp v0.6.0
6565
github.com/googlecloudrobotics/ilog v0.0.0-20231123101900-2533d3d7f8e1
6666
github.com/sirupsen/logrus v1.9.0
6767
)
6868

6969
require (
70-
cloud.google.com/go/compute v1.19.3 // indirect
70+
cloud.google.com/go/compute v1.23.3 // indirect
7171
cloud.google.com/go/compute/metadata v0.2.3 // indirect
72-
cloud.google.com/go/iam v0.13.0 // indirect
73-
cloud.google.com/go/monitoring v1.13.0 // indirect
74-
cloud.google.com/go/trace v1.9.0 // indirect
75-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
76-
github.com/Azure/go-autorest/autorest v0.11.28 // indirect
77-
github.com/Azure/go-autorest/autorest/adal v0.9.21 // indirect
78-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
79-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
80-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
72+
cloud.google.com/go/iam v1.1.5 // indirect
73+
cloud.google.com/go/monitoring v1.16.3 // indirect
74+
cloud.google.com/go/trace v1.10.4 // indirect
8175
github.com/BurntSushi/toml v1.2.1 // indirect
8276
github.com/alessio/shellescape v1.4.1 // indirect
8377
github.com/beorn7/perks v1.0.1 // indirect
8478
github.com/census-instrumentation/opencensus-proto v0.4.1 // indirect
85-
github.com/davecgh/go-spew v1.1.1 // indirect
86-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
87-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
88-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
79+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
80+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
81+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
82+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
8983
github.com/ghodss/yaml v1.0.0 // indirect
9084
github.com/go-errors/errors v1.4.2 // indirect
9185
github.com/go-kit/log v0.2.1 // indirect
92-
github.com/go-logfmt/logfmt v0.5.1 // indirect
93-
github.com/go-logr/logr v1.2.4 // indirect
94-
github.com/go-logr/zapr v1.2.3 // indirect
95-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
86+
github.com/go-logfmt/logfmt v0.6.0 // indirect
87+
github.com/go-logr/logr v1.3.0 // indirect
88+
github.com/go-logr/zapr v1.2.4 // indirect
89+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
9690
github.com/go-openapi/jsonreference v0.20.2 // indirect
97-
github.com/go-openapi/swag v0.22.3 // indirect
91+
github.com/go-openapi/swag v0.22.4 // indirect
9892
github.com/gogo/protobuf v1.3.2 // indirect
99-
github.com/golang-jwt/jwt/v4 v4.4.2 // indirect
10093
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
10194
github.com/google/btree v1.1.2 // indirect
102-
github.com/google/gnostic v0.6.9 // indirect
95+
github.com/google/gnostic-models v0.6.8 // indirect
10396
github.com/google/gofuzz v1.2.0 // indirect
104-
github.com/google/s2a-go v0.1.4 // indirect
97+
github.com/google/s2a-go v0.1.7 // indirect
10598
github.com/google/safetext v0.0.0-20221026122733-23539d61753f // indirect
10699
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
107-
github.com/google/uuid v1.3.0 // indirect
108-
github.com/googleapis/enterprise-certificate-proxy v0.2.4 // indirect
100+
github.com/google/uuid v1.4.0 // indirect
101+
github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
109102
github.com/googleapis/gax-go/v2 v2.12.0 // indirect
110103
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
111104
github.com/h2non/parth v0.0.0-20190131123155-b4df798d6542 // indirect
112-
github.com/imdario/mergo v0.3.13 // indirect
113-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
105+
github.com/imdario/mergo v0.3.16 // indirect
106+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
114107
github.com/jmespath/go-jmespath v0.4.0 // indirect
115108
github.com/josharian/intern v1.0.0 // indirect
116109
github.com/json-iterator/go v1.1.12 // indirect
117110
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
118111
github.com/mailru/easyjson v0.7.7 // indirect
119-
github.com/mattn/go-isatty v0.0.16 // indirect
120-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
112+
github.com/mattn/go-isatty v0.0.19 // indirect
113+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
121114
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
122115
github.com/modern-go/reflect2 v1.0.2 // indirect
123116
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
124117
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
125118
github.com/pelletier/go-toml v1.9.5 // indirect
126119
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
127-
github.com/prometheus/client_model v0.3.0 // indirect
128-
github.com/prometheus/common v0.37.0 // indirect
129-
github.com/prometheus/prometheus v0.39.1 // indirect
130-
github.com/xlab/treeprint v1.1.0 // indirect
131-
go.starlark.net v0.0.0-20221028183056-acb66ad56dd2 // indirect
132-
go.uber.org/atomic v1.10.0 // indirect
133-
go.uber.org/multierr v1.8.0 // indirect
134-
go.uber.org/zap v1.23.0 // indirect
135-
golang.org/x/term v0.13.0 // indirect
136-
golang.org/x/text v0.13.0 // indirect
137-
golang.org/x/time v0.3.0 // indirect
120+
github.com/prometheus/client_model v0.5.0 // indirect
121+
github.com/prometheus/common v0.45.0 // indirect
122+
github.com/prometheus/prometheus v0.48.0 // indirect
123+
github.com/xlab/treeprint v1.2.0 // indirect
124+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
125+
go.uber.org/goleak v1.3.0 // indirect
126+
go.uber.org/multierr v1.11.0 // indirect
127+
go.uber.org/zap v1.26.0 // indirect
128+
golang.org/x/exp v0.0.0-20231127185646-65229373498e // indirect
129+
golang.org/x/term v0.15.0 // indirect
130+
golang.org/x/text v0.14.0 // indirect
131+
golang.org/x/time v0.5.0 // indirect
138132
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
139-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
140-
google.golang.org/appengine v1.6.7 // indirect
141-
google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
142-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
133+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
134+
google.golang.org/appengine v1.6.8 // indirect
135+
google.golang.org/genproto/googleapis/api v0.0.0-20231127180814-3a041ad873d4 // indirect
136+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231127180814-3a041ad873d4 // indirect
143137
gopkg.in/inf.v0 v0.9.1 // indirect
144138
gopkg.in/yaml.v2 v2.4.0 // indirect
145139
gopkg.in/yaml.v3 v3.0.1 // indirect
146-
k8s.io/component-base v0.25.3 // indirect
147-
k8s.io/klog/v2 v2.100.1 // indirect
148-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
149-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
140+
k8s.io/component-base v0.28.4 // indirect
141+
k8s.io/klog/v2 v2.110.1 // indirect
142+
k8s.io/kube-openapi v0.0.0-20231129212854-f0671cc7e66a // indirect
143+
k8s.io/utils v0.0.0-20231127182322-b307cd553661 // indirect
150144
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
151-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
152-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
153-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
145+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
146+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
147+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
154148
)

0 commit comments

Comments
 (0)