Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump k8s.io/api, k8s.io/client-go, k8s.io/apimachinery from 0.22.7 to 0.23.6 #6037

Merged
merged 1 commit into from
May 6, 2022
Merged

Bump k8s.io/api, k8s.io/client-go, k8s.io/apimachinery from 0.22.7 to 0.23.6 #6037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
22 changes: 13 additions & 9 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ require (
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/pprof v0.0.0-20220218203455-0368bd9e19a7 // indirect
github.com/googleapis/gax-go/v2 v2.1.1 // indirect
github.com/googleapis/gnostic v0.4.1 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gophercloud/gophercloud v0.24.0 // indirect
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2.0.20201207153454-9f6bf00c00a7 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
Expand Down Expand Up @@ -271,13 +271,15 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.57.0 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
k8s.io/api v0.22.7 // indirect
k8s.io/apimachinery v0.22.7 // indirect
k8s.io/client-go v12.0.0+incompatible // indirect
k8s.io/api v0.23.6 // indirect
k8s.io/apimachinery v0.23.6 // indirect
k8s.io/client-go v0.23.6 // indirect
k8s.io/klog/v2 v2.40.1 // indirect
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
rsc.io/binaryregexp v0.2.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
)

Expand All @@ -290,11 +292,11 @@ replace github.com/Azure/azure-sdk-for-go => github.com/Azure/azure-sdk-for-go v

replace github.com/Azure/azure-storage-blob-go => github.com/MasslessParticle/azure-storage-blob-go v0.14.1-0.20220216145902-b5e698eff68e

replace k8s.io/client-go => k8s.io/client-go v0.21.0
replace k8s.io/client-go => k8s.io/client-go v0.23.6

replace k8s.io/api => k8s.io/api v0.21.0
replace k8s.io/api => k8s.io/api v0.23.6

replace k8s.io/apimachinery => k8s.io/apimachinery v0.21.0
replace k8s.io/apimachinery => k8s.io/apimachinery v0.23.6

replace github.com/hashicorp/consul => github.com/hashicorp/consul v1.5.1

Expand All @@ -312,3 +314,5 @@ replace github.com/bradfitz/gomemcache => github.com/themihai/gomemcache v0.0.0-
replace github.com/thanos-io/thanos v0.22.0 => github.com/thanos-io/thanos v0.19.1-0.20211126105533-c5505f5eaa7d

replace github.com/cloudflare/cloudflare-go => github.com/cyriltovena/cloudflare-go v0.27.1-0.20211118103540-ff77400bcb93

exclude k8s.io/client-go v8.0.0+incompatible
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm trying to understand this exclude directive -- can you help me understand what it helps with?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Adding exclude k8s.io/client-go v8.0.0+incompatible helps to keep version of github.com/influxdata/telegraf v1.16.3.
When I upgrade k8s.io/client-go to v0.23.6, go downgrades github.com/influxdata/telegraf to v0.10.1. When I upgrade telegraf back to v1.16.3, go upgrades k8s.io/client-go to v8.0.0+incompatible. But version v8.0.0+incompatible is actually older than v0.23.6.

exclude k8s.io/client-go v8.0.0+incompatible added to have both github.com/influxdata/telegraf v1.16.3 and k8s.io/client-go v0.23.6.
I took this solution from prometheus https://github.com/prometheus/prometheus/blob/main/go.mod#L102-L103.

Not sure if we need to exclude other pre-go-mod kubernetes tags here. I decided to go with as small diff as possible in this PR

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I think that's reasonable 👍

56 changes: 35 additions & 21 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion vendor/github.com/googleapis/gnostic/compiler/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 13 additions & 7 deletions vendor/github.com/googleapis/gnostic/compiler/context.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 12 additions & 3 deletions vendor/github.com/googleapis/gnostic/compiler/error.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

101 changes: 0 additions & 101 deletions vendor/github.com/googleapis/gnostic/compiler/extension-handler.go
View file
Open in desktop

This file was deleted.

85 changes: 85 additions & 0 deletions vendor/github.com/googleapis/gnostic/compiler/extensions.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading