Skip to content
This repository has been archived by the owner on Mar 9, 2022. It is now read-only.

vendor: update kubernetes to v1.18.0-beta.1 #1413

Merged
merged 4 commits into from
Mar 6, 2020

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Mar 5, 2020

temporarily rebased on top of #1414 to run CI before that one is merged done

@thaJeztah
Copy link
Member Author

That didn't work out well; that's a lot of "red". 😞

@thaJeztah
Copy link
Member Author

thaJeztah commented Mar 5, 2020

Ah; new dependency. Thought I checked them all

vendor/k8s.io/apimachinery/pkg/runtime/converter.go:34:2: cannot find package "sigs.k8s.io/structured-merge-diff/v3/value" in any of:
sigs.k8s.io/structured-merge-diff/v3 => sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200207200219-5e70324e7c1c

Copy link
Contributor

@Zyqsempai Zyqsempai left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Member Author

okay, that repo just tagged v3.0.0, so I'm gonna slightly diverge from the version that kubernetes uses, which is 5 commits behind; kubernetes-sigs/structured-merge-diff@5e70324...v3.0.0

@thaJeztah thaJeztah force-pushed the update_kubernetes branch from b60e7d0 to 3ec28fc Compare March 5, 2020 22:08
@thaJeztah
Copy link
Member Author

Not out of the woods yet. Was afraid that would happen. Probably should update containerd first;

# github.com/containerd/cri/vendor/k8s.io/apimachinery/pkg/util/intstr
vendor/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go:41:11: undefined: proto.GoGoProtoPackageIsVersion3
# github.com/containerd/cri/vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2
vendor/k8s.io/cri-api/pkg/apis/runtime/v1alpha2/api.pb.go:47:11: undefined: "github.com/containerd/cri/vendor/github.com/gogo/protobuf/proto".GoGoProtoPackageIsVersion3
Makefile:87: recipe for target '_output/containerd' failed

@thaJeztah thaJeztah changed the title vendor: update kubernetes to v1.18.0-beta.1 [WIP] vendor: update kubernetes to v1.18.0-beta.1 Mar 5, 2020
@thaJeztah thaJeztah force-pushed the update_kubernetes branch 3 times, most recently from a2bc18b to 914d498 Compare March 5, 2020 23:18
@thaJeztah thaJeztah force-pushed the update_kubernetes branch from 914d498 to a3e7f68 Compare March 6, 2020 15:18
@thaJeztah thaJeztah changed the title [WIP] vendor: update kubernetes to v1.18.0-beta.1 vendor: update kubernetes to v1.18.0-beta.1 Mar 6, 2020
Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM
Thx for also doing the integration test change, don't you love it when public scoped utility apis completely change without so much as a comment..

@mikebrow mikebrow merged commit 1a00c06 into containerd:master Mar 6, 2020
@thaJeztah thaJeztah deleted the update_kubernetes branch March 6, 2020 17:35
@thaJeztah
Copy link
Member Author

Yes, always fun. It's why I make so many jokes about Go projects all of a sudden using "SemVer" because of go modules

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants