Repository navigation
ntp: add rollback migration for server-object time sources - #4969
Draft
xiaotianlyu wants to merge 1 commit into
Draft
xiaotianlyu wants to merge 1 commit into
xiaotianlyu wants to merge 1 commit into
Conversation
xiaotianlyu
force-pushed
the
feat/chrony-ntp-object-list
branch
from
October 9, 2026 23:42
6c173ea to
35a2d98
Compare
Signed-off-by: Melody Lyu <tianlyu@amazon.com>
xiaotianlyu
force-pushed
the
feat/chrony-ntp-object-list
branch
from
October 10, 2026 15:47
35a2d98 to
0ed678e
Compare
This was referenced Oct 10, 2026
Draft
This file contains hidden or 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
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:
settings.ntp.time-servers.options = []when no options are common or conflicting options cannot be converted safely.[]; removesettings.ntp.loggingon rollback.The old template renders all addresses as
pool, so rollback loses per-server directives and unique options. Example rollback result:Testing done:
Local:
cargo test -p ntp-time-servers: 19 passed, including common/conflicting options, invalid entries, metadata, and pending data.On-box with all three PRs,
aws-k8s-1.32x86_64:1.67.0AMI, and signed update repository.1.66.0preserving default, custom-pool, and empty lists.pool 169.254.169.123 iburst, synchronized with that sole source.[], andminpoll 4/04matching.NRestarts=0at state checks.Before merge:
1.66.0 -> 1.67.0, matching the completed tests.1.68.0, move registration to1.67.0 -> 1.68.0and repeat upgrade/rollback tests with the candidate and final1.67.0baseline.17.2.0lacks this feature; the test image used the rebuilt local kit.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.