Skip to content

chrony: revert per-server time source configuration - #1074

Merged
xiaotianlyu merged 2 commits into
bottlerocket-os:developfrom
xiaotianlyu:revert/chrony-pr-1030
Oct 2, 2026
Merged

xiaotianlyu merged 2 commits into
bottlerocket-os:developfrom
xiaotianlyu:revert/chrony-pr-1030

Conversation

@xiaotianlyu

@xiaotianlyu xiaotianlyu commented Oct 2, 2026 •

Copy link
Copy Markdown
Contributor

Description of changes:

Reverts #1030. The settings SDK accepts both the old list and new named-map formats, but an upgraded node cannot safely switch between them at the same datastore path.

This restores the previous chrony template and returns core-kit to bottlerocket-settings-models 0.29.0. The settings SDK release is not reverted.

Related PRs:

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.

@xiaotianlyu
xiaotianlyu marked this pull request as ready for review October 2, 2026 04:48
@ginglis13

Copy link
Copy Markdown
Contributor

Can you please create your commit(s) with git-revert https://git-scm.com/docs/git-revert.html

This reverts commit e8a28ed.

Signed-off-by: Melody Lyu <tianlyu@amazon.com>
This reverts commit 603b899.

Signed-off-by: Melody Lyu <tianlyu@amazon.com>
@xiaotianlyu
xiaotianlyu force-pushed the revert/chrony-pr-1030 branch from 3824bd2 to 06928fb Compare October 2, 2026 17:28
@ginglis13

Copy link
Copy Markdown
Contributor

A nit but description says

This restores the previous chrony template and returns core-kit to bottlerocket-settings-models 0.28.0. The settings SDK release is not reverted.

your commit has reverted back to 0.29.0 . Technically the revert commit should revert back to 0.28.0 and you'd add another commit on top that just does the settings-model bump to 0.29.0

@xiaotianlyu
xiaotianlyu merged commit b47087c into bottlerocket-os:develop Oct 2, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants