[1.15.x] Cherry picks of recent updates from develop
#3502
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
The 'hyper_proxy' module is clone of tafia/hyper-proxy, but modified to take advantage of newer Rust dependencies. Since Bottlerocket only uses 'rustls', other features and unused lines of code have been removed. (cherry picked from commit cccc16c)
(cherry picked from commit 56a3efb)
Newer versions of tungstenite implemented the v13 version of the Web Sockets protocol (described in https://www.rfc-editor.org/rfc/rfc6455). In this version, new headers are required in the upgrade request. With this update, now the upgrade request sent by apiclient include the missing headers. In the same version, the 'frame' message was added. Neither apiserver nor apiclient send this type of message, so they are ignored by apiclient. Signed-off-by: Arnaldo Garcia Rincon <agarrcia@amazon.com> (cherry picked from commit c475e12)
The filesystem will mount without specifying a specific type when defining a systemd Mount. This allows any filesystem that the OS can mount to be used as a filesystem for /local. Before this change, the boot would fail if the /local filesystem didn't match the one specified in /usr/share/bottlerocket/image-features.env Signed-off-by: Matthew Yeazel <yeazelm@amazon.com> (cherry picked from commit 3ac01cb)
Bumps [webpki](https://github.com/briansmith/webpki) from 0.22.1 to 0.22.2. - [Commits](https://github.com/briansmith/webpki/commits) --- updated-dependencies: - dependency-name: webpki dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> (cherry picked from commit d192991)
This updates the `open-vm-tools` package to use the 12.3.0 release. There are a lot of merged changes since the previous release [0], but most are called out as not being applicable for this package. The only significant change appears to be the commit to add addition x509 checks to the SAM token verification. [0] vmware/open-vm-tools@stable-12.2.5...stable-12.3.0 [1] vmware/open-vm-tools@74b6d0d Signed-off-by: Sean McGinnis <stmcg@amazon.com> (cherry picked from commit f944f80)
Signed-off-by: Matthew Yeazel <yeazelm@amazon.com> (cherry picked from commit 22bf97e)
yeazelm
approved these changes
Oct 3, 2023
webern
suggested changes
Oct 4, 2023
That was going to be done in a follow up along with getting the CHANGELOG and Release.toml updates. But we can wait and just do it all in one go too. |
webern
approved these changes
Oct 4, 2023
Unfortunately the cargo install command does not seem to respect the rust-toolchain.toml and .cargo/config.toml settings when installing from a git reference. rust-lang/cargo#11036 We need to fix this by adding +nightly and specifying -Z bindeps in the cargo install command for twoliter. (cherry picked from commit 8323260)
When we are testing changes to Twoliter, we need to install from git. In that case the sha is not going to match the version output from Twoliter --version. This means that we have to rebuild and install Twoliter each time we call cargo make. It takes 10 minutes to compile Twoliter. Fix this such that TWOLITER_ALLOW_BINARY_INSTALL=false skips checking the version when any `twoliter` is installed. (cherry picked from commit 31bf509)
Allow the skipping of the Twoliter version when deciding whether or not to install Twoliter. This allows us to accept any installed Twoliter binary and move on without re-installing. (cherry picked from commit 21a56ae)
If the twoliter directory does not exist, make sure we create it regardless of which installation method is being used. (cherry picked from commit e68d6fc)
arnaldo2792
approved these changes
Oct 4, 2023
Has - testsys fixes - requires specification of the SDK in Twoliter.toml - Adds logging functionality for pubsys and testsys (cherry picked from commit 62d4af9)
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.
Description of changes:
This is a set of cherry picks from the
developbranch to1.15.xto prepare for a future 1.15.1 release.This includes the commits from the following PRs:
Testing done:
See testing performed on
developfor each change.Terms of contribution:
By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.