deps: upgrade to k8s 1.21.1 #4620
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
Breaking Changes: * Refactor client init to not use `ClientBuilder` (see kubernetes-sigs/controller-runtime#1409) * Add stub `RemoveStreams` method on `fakePortForward` Mechanical Changes: * Upgrade K8s dependencies to v0.21.1 (aka 1.21.1) * Upgrade controller-runtime to 0.9.0 (required for K8s v0.21.1 deps) * Upgrade tilt-apiserver to v0.4.0 (requires for K8s v0.21.1 deps) * Remove `moby/term` replace (bug was fixed upstream and older version no longer compiles)
milas
commented
Jun 8, 2021
| @@ -128,9 +127,5 @@ replace ( | |||
| go.opencensus.io => github.com/tilt-dev/opencensus-go v0.22.5-0.20200904175236-275b1754f353 | |||
| golang.org/x/crypto => golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 | |||
|
|
|||
| // Workaround for: | |||
| // https://github.com/moby/term/issues/15 | |||
| golang.org/x/sys => golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6 | |||
There was a problem hiding this comment.
One of the updated dependencies was using a new function that wasn't available. The Darwin compilation issue in moby/term was fixed and the new version compiles on macOS again. I didn't see any odddities in terminal rendering using the TUI either.
| Logger: logr, | ||
| GracefulShutdownTimeout: &timeout, | ||
| }) | ||
| if err != nil { | ||
| return fmt.Errorf("unable to create controller manager: %v", err) | ||
| } | ||
|
|
||
| // provide the deferred client with the real client now that it has been initialized | ||
| m.deferredClient.initialize(mgr.GetClient()) |
There was a problem hiding this comment.
ClientBuilder is gone and ctrl.NewManager can handle uncached objects, so this just explicitly initializes the deferred client after setting that up. Uncached objects are injected via ProvideUncachedObjects (currently nil for release, except in tests where we explicitly call this constructor and pass Filewatch)
nicks
approved these changes
Jun 8, 2021
landism
pushed a commit
that referenced
this pull request
Jun 9, 2021
Required Changes: * Refactor client init to not use `ClientBuilder` (see kubernetes-sigs/controller-runtime#1409) * Add stub `RemoveStreams` method on `fakePortForward` * Re-generate OpenAPI spec for K8s meta types shared by Tilt apiserver Mechanical Changes: * Upgrade K8s dependencies to v0.21.1 (aka 1.21.1) * Upgrade controller-runtime to 0.9.0 (required for K8s v0.21.1 deps) * Upgrade tilt-apiserver to v0.4.0 (requires for K8s v0.21.1 deps) * Remove `moby/term` replace (bug was fixed upstream and older version no longer compiles)
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.
Required Changes:
ClientBuilder(see ⚠️ Allow setting NewClientFunc w/o implementing an interface kubernetes-sigs/controller-runtime#1409)
RemoveStreamsmethod onfakePortForwardMechanical Changes:
moby/termreplace (bug was fixed upstream and olderversion no longer compiles)