vendor: bump apimachinery to 1.11.3 #382
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Also had to manually add vfsutil to testImports because glide didn't pick it up for some reason. Commands run: rm glide.lock glide install --strip-vendor glide-vc --use-lock-file --no-tests --only-code
openshift-ci-robot
added
the
size/XXL
|
I added this because our k8s version is so old that it's making it impossible to actually successfully use glide to pull in some new operator configuration repos. (e.g. the cluster-network-operator) |
|
@abhinavdahiya yeah, I thought about that, but glide is so fragile, I personally dislike long-running branches. Up to you. |
|
/approve |
openshift-ci-robot
added
the
approved
|
For additional context, this is because glide is unable to handle the case where an operator, using Wanted to just merge this now so we can all make progress. Normally I put |
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abhinavdahiya, squeed, wking The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
wking
added a commit
to wking/openshift-installer
that referenced
this pull request
Oct 30, 2018
That's the version that's compatible with Kubernetes 1.11 [1], and we've been using Kubernetes 1.11.3 for apimachinery since 2a606ef (vendor: bump apimachinery to 1.11.3, 2018-10-01, openshift#382). I edited Gopkg.toml by hand and regenerated everything else with: $ dep ensure using: $ dep version dep: version : v0.5.0 build date : git hash : 22125cf go version : go1.10.3 go compiler : gc platform : linux/amd64 features : ImportDuringSolve=false [1]: kubernetes/client-go@7d04d0e
wking
added a commit
to wking/openshift-installer
that referenced
this pull request
Nov 2, 2018
8.0.0 is the version that's compatible with Kubernetes 1.11 [1], and we've been using Kubernetes 1.11.3 for apimachinery since 2a606ef (vendor: bump apimachinery to 1.11.3, 2018-10-01, openshift#382). client-go 9.0.0 is nominally compatible with Kubernetes 1.12 [2], and I want this for UntilWithoutRetry [3] which is new in 9.0.0 [4]. I edited Gopkg.toml by hand and regenerated everything else with: $ dep ensure using: $ dep version dep: version : v0.5.0 build date : git hash : 22125cf go version : go1.10.3 go compiler : gc platform : linux/amd64 features : ImportDuringSolve=false I need to bump apimachinery into the 1.12 channel as well to avoid (and now I match client-go's declared dependency [2]): $ dep ensure Solving failure: package k8s.io/apimachinery/pkg/util/naming does not exist within project k8s.io/apimachinery naming is new in 1.12 [5] and we're pulling it with: $ git grep util/naming vendor vendor/k8s.io/apimachinery/pkg/runtime/scheme.go: "k8s.io/apimachinery/pkg/util/naming" vendor/k8s.io/client-go/tools/cache/reflector.go: "k8s.io/apimachinery/pkg/util/naming" $ git grep tools/cache vendor/k8s.io/client-go/tools/watch vendor/k8s.io/client-go/tools/watch/informerwatcher.go: "k8s.io/client-go/tools/cache" vendor/k8s.io/client-go/tools/watch/until.go: "k8s.io/client-go/tools/cache" Then I needed to change client-go to an override to avoid: $ dep ensure Solving failure: package k8s.io/api/autoscaling/v2beta2 does not exist within project k8s.io/api Besides the version bump, dep also pulled in libraries for waiting on Kubernetes events. [1]: kubernetes/client-go@7d04d0e [2]: kubernetes/client-go@1638f89 [3]: https://github.com/kubernetes/client-go/blob/v9.0.0/tools/watch/until.go#L47-L58 [4]: kubernetes/client-go@cbdb98d [5]: kubernetes/apimachinery@3c4948e
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also had to manually add vfsutil to testImports because glide didn't pick it up for some reason.
Commands run: