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

Update k8s dependencies to v1.19.0 #9824

Merged
merged 1 commit into from
Aug 27, 2020
Merged

Update k8s dependencies to v1.19.0 #9824

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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,49 +2,49 @@ module k8s.io/kops

go 1.14

// Version kubernetes-1.19.0-rc.4 => tag v0.19.0-rc.4
// Version kubernetes-1.19.0 => tag v0.19.0

replace k8s.io/api => k8s.io/api v0.19.0-rc.4
replace k8s.io/api => k8s.io/api v0.19.0

replace k8s.io/apimachinery => k8s.io/apimachinery v0.19.0-rc.4
replace k8s.io/apimachinery => k8s.io/apimachinery v0.19.0

replace k8s.io/client-go => k8s.io/client-go v0.19.0-rc.4
replace k8s.io/client-go => k8s.io/client-go v0.19.0

replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0-rc.4
replace k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0

replace k8s.io/kubectl => k8s.io/kubectl v0.19.0-rc.4
replace k8s.io/kubectl => k8s.io/kubectl v0.19.0

replace k8s.io/apiserver => k8s.io/apiserver v0.19.0-rc.4
replace k8s.io/apiserver => k8s.io/apiserver v0.19.0

replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0-rc.4
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0

replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0-rc.4
replace k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0

replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0-rc.4
replace k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0

replace k8s.io/cri-api => k8s.io/cri-api v0.19.0-rc.4
replace k8s.io/cri-api => k8s.io/cri-api v0.19.0

replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0-rc.4
replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0

replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.0-rc.4
replace k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.0

replace k8s.io/component-base => k8s.io/component-base v0.19.0-rc.4
replace k8s.io/component-base => k8s.io/component-base v0.19.0

replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0-rc.4
replace k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0

replace k8s.io/metrics => k8s.io/metrics v0.19.0-rc.4
replace k8s.io/metrics => k8s.io/metrics v0.19.0

replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0-rc.4
replace k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0

replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.0-rc.4
replace k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.0

replace k8s.io/kubelet => k8s.io/kubelet v0.19.0-rc.4
replace k8s.io/kubelet => k8s.io/kubelet v0.19.0

replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0-rc.4
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0

replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0-rc.4
replace k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0

replace k8s.io/code-generator => k8s.io/code-generator v0.19.0-rc.4
replace k8s.io/code-generator => k8s.io/code-generator v0.19.0

replace github.com/gophercloud/gophercloud => github.com/gophercloud/gophercloud v0.11.0
Copy link
Member

Choose a reason for hiding this comment

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

Could you try remove this line? It shouldn't be necessary now that k8s doesn't directly depend on it. gomod should hopefully just use the version we specify and there should only be one line in go.sum.

Copy link
Member Author

Choose a reason for hiding this comment

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

Not yet :)

go: k8s.io/[email protected] requires
	k8s.io/[email protected] requires
	k8s.io/[email protected]: reading k8s.io/code-generator/go.mod at revision v0.0.0: unknown revision v0.0.0

Copy link
Member Author

@hakman hakman Aug 27, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

We should keep an eye on this and upgrade when it is released:
kubernetes/cloud-provider-openstack#1151


Expand Down Expand Up @@ -107,12 +107,12 @@ require (
gopkg.in/inf.v0 v0.9.1
gopkg.in/yaml.v2 v2.3.0
honnef.co/go/tools v0.0.1-2020.1.4
k8s.io/api v0.19.0-rc.4
k8s.io/apimachinery v0.19.0-rc.4
k8s.io/cli-runtime v0.19.0-rc.4
k8s.io/client-go v0.19.0-rc.4
k8s.io/cloud-provider-openstack v1.17.1-0.20200717165102-4150ca0588f1
k8s.io/component-base v0.19.0-rc.4
k8s.io/api v0.19.0
k8s.io/apimachinery v0.19.0
k8s.io/cli-runtime v0.19.0
k8s.io/client-go v0.19.0
k8s.io/cloud-provider-openstack v1.18.0
k8s.io/component-base v0.19.0
k8s.io/gengo v0.0.0-20200710205751-c0d492a0f3ca
k8s.io/helm v2.9.0+incompatible
k8s.io/klog/v2 v2.3.0
Expand Down
91 changes: 41 additions & 50 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions vendor/github.com/evanphx/json-patch/.travis.yml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion vendor/github.com/evanphx/json-patch/LICENSE
View file
Open in desktop

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

11 changes: 6 additions & 5 deletions vendor/github.com/evanphx/json-patch/README.md
View file
Open in desktop

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

13 changes: 8 additions & 5 deletions vendor/github.com/evanphx/json-patch/merge.go
View file
Open in desktop

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

28 changes: 18 additions & 10 deletions vendor/github.com/evanphx/json-patch/patch.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion vendor/k8s.io/apimachinery/pkg/runtime/BUILD.bazel
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion vendor/k8s.io/apimachinery/pkg/runtime/converter.go
View file
Open in desktop

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

10 changes: 7 additions & 3 deletions vendor/k8s.io/apimachinery/pkg/util/net/http.go
View file
Open in desktop

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

31 changes: 7 additions & 24 deletions vendor/k8s.io/apimachinery/pkg/util/net/util.go
View file
Open in desktop

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

14 changes: 0 additions & 14 deletions vendor/k8s.io/cloud-provider-openstack/pkg/util/errors/errors.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion vendor/k8s.io/cloud-provider-openstack/pkg/util/openstack/BUILD.bazel
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion vendor/k8s.io/cloud-provider-openstack/pkg/util/openstack/loadbalancer.go
View file
Open in desktop

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

Loading