schnauzer: add support for update repositories in China #2285
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
rpkelly
approved these changes
Jul 18, 2022
|
Added |
jpculp
force-pushed
the
regional-tuf-support
branch
from
7d48c77
to
090ea8a
Compare
|
Rebased. |
jpculp
force-pushed
the
regional-tuf-support
branch
from
090ea8a
to
387a607
Compare
|
Added symlinks for |
etungsten
approved these changes
Jul 25, 2022
bcressey
reviewed
Jul 25, 2022
jpculp
force-pushed
the
regional-tuf-support
branch
from
387a607
to
50b6eab
Compare
|
etungsten
approved these changes
Jul 25, 2022
bcressey
reviewed
Jul 25, 2022
sources/api/schnauzer/src/helpers.rs
Outdated
Comment on lines
1385
to
1388
| match partition { | ||
| "aws-cn" => format!("https://{}.s3.{}.amazonaws.com.cn/latest", bucket, region), | ||
| _ => format!("https://{}.s3.{}.amazonaws.com/latest", bucket, region), | ||
| } |
There was a problem hiding this comment.
Per discussion, we should try to use the dual stack endpoints here for forward compatibility with IPv6-only subnets.
There was a problem hiding this comment.
Rather than just specifying the bucket, I appended .s3.dualstack to the strings directly (and verified it still works for cn-north-1 and cn-northwest-1). In the event that we add a region that does not support dual stack endpoints we can just do <bucket_id>.s3. We could get fancier with the map, but I wanted to keep things simple.
AWS variants now generate the `settings.updates.targets-base-url` setting based on region.
jpculp
force-pushed
the
regional-tuf-support
branch
from
50b6eab
to
97ab305
Compare
|
Tweaked the code a bit to support virtual hosted-style dual-stack s3 endpoints for forward compatibility with IPv6-only subnets. |
etungsten
approved these changes
Jul 26, 2022
rpkelly
approved these changes
Jul 26, 2022
bcressey
approved these changes
Jul 26, 2022
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 adds helpers that settings generators can use to set the
updates.metadata-base-urlandupdates.targets-base-urlvalues to regionalized repositories. For now, this only includes China regionscn-north-1andcn-northwest-1, while current regions will continue to use the public updates repository, updates.bottlerocket.aws.Testing done:
Built and launched Bottlerocket and verified the expected
updatessettings in: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.