Skip to content
This repository has been archived by the owner on Jan 28, 2020. It is now read-only.

Vendor latest Cluster-API and testify #244

Merged
merged 2 commits into from
May 30, 2018

Conversation

dgoodwin
Copy link
Contributor

Cluster API recently merged a fix we need for successful machine deletion. This required a couple interface updates which have been applied as a separate commit.

Testify was a very old copy, the author has recently reappeared and been merging some fixes, one of which should improve test output in editors such as vim.

@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label May 30, 2018
glide.yaml Outdated
@@ -24,3 +24,6 @@ import:
- package: github.com/kubernetes-incubator/apiserver-builder
version: ^1.9.0-alpha.3
- package: sigs.k8s.io/cluster-api
version: master
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we really need to explicitly specify master for the version? Isn't that the default?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't know what's going on but specifying master appears to actually be dead wrong, it was giving me an Aug 17th commit for testify somehow. Removing it and I get the proper master version. Updating.

@dgoodwin dgoodwin force-pushed the vendor-capi-testify branch from aef359b to 52edb14 Compare May 30, 2018 13:47
@dgoodwin
Copy link
Contributor Author

Updated.

@@ -24,3 +24,4 @@ import:
- package: github.com/kubernetes-incubator/apiserver-builder
version: ^1.9.0-alpha.3
- package: sigs.k8s.io/cluster-api
- package: github.com/stretchr/testify
Copy link
Contributor

@staebler staebler May 30, 2018

Choose a reason for hiding this comment

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

So the follow-on to the comment about not needing to explicitly specify the master version is that we shouldn't need this line at in the glide.yaml. Glide should pick up this dependency automatically by inspecting the imports.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Are we sure this doesn't happen once and then lock it? I'm not sure what's going on but we were stuck on a very old testify, sometime last year, and I'm sure we've run glide up since then.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

If I run glide up -v on master without these changes, testify jumps from Sep 2016 to Mar 2018. I have no idea how it's stayed at 2016 so long amidst our past updates. I'm inclined to list it explicitly as a result though.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think we should keep the explicit list, it sounds like glide gets really weird with your local ~/.glide/cache if you don't explicitly set what you want. Also sounds like even glide itself recommends switching to dep. Masterminds/glide#592

Copy link
Contributor

Choose a reason for hiding this comment

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

It has stayed at Sep 2016 because at one point our glide.yaml was tied to v1.1.4. Running glide cc clears that up. It still does not use the HEAD of the master branch without explicitly specifying the repo in the glide.yaml because kube-openapi has a dependency on testify. I can live with explicitly including testify in the glide.yaml if there are truly things that we need from testify that are not there in the f6abca593680b2315d2075e0f5e2a9751e3f431a commit.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes the commits I'm after are from earlier this year, f6abca593680b2315d2075e0f5e2a9751e3f431a appears to be from July 2017.

Where did that commit ID originate from though? We were pinned to 69483b4bd14f5845b5a1e55bca19e954e827f1d0 previously.

Copy link
Contributor

Choose a reason for hiding this comment

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

version: v1.1.4

@staebler
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label May 30, 2018
@openshift-merge-robot openshift-merge-robot merged commit e67109c into openshift:master May 30, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants