Skip to content

fix: Update Chrony Service Config #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jan 27, 2025
Merged

fix: Update Chrony Service Config #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
12c0f58
update chrony config
haofan-ms Jan 23, 2025
5be26db
update
haofan-ms Jan 23, 2025
c759658
heredoc
haofan-ms Jan 23, 2025
16730aa
additional command to reload
haofan-ms Jan 23, 2025
aafad00
clear comments for custom data space
haofan-ms Jan 24, 2025
0e58bae
Revert "clear comments for custom data space"
haofan-ms Jan 24, 2025
3a995b1
clean up for custom data space
haofan-ms Jan 24, 2025
597bcb6
update scripts
haofan-ms Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions parts/k8s/cloud-init/artifacts/cse_config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,13 @@ configureEtcd() {
}
configureChrony() {
sed -i "s/makestep.*/makestep 1.0 -1/g" /etc/chrony/chrony.conf
echo "refclock PHC /dev/ptp0 poll 3 dpoll -2 offset 0" >> /etc/chrony/chrony.conf
cat > /etc/udev/rules.d/99-ptp_hyperv.rules << EOF
ACTION!="add", GOTO="ptp_hyperv"
SUBSYSTEM=="ptp", ATTR{clock_name}=="hyperv", SYMLINK += "ptp_hyperv"
LABEL="ptp_hyperv"
EOF
udevadm control --reload
udevadm trigger --subsystem-match=ptp --action=add -v
}
ensureChrony() {
systemctlEnableAndStart chrony || exit {{GetCSEErrorCode "ERR_SYSTEMCTL_START_FAIL"}}
Expand Down Expand Up @@ -336,16 +342,9 @@ ensureContainerd() {
}

ensureNoBridgeDocker0 () {
# Define the name of the bridge you want to check and potentially delete
BRIDGE_NAME="docker0"
# Check if the bridge exists
if ip link show "$BRIDGE_NAME" &> /dev/null; then
# The bridge exists, so delete it
echo "Deleting bridge network $BRIDGE_NAME"
retrycmd 120 5 25 ip link delete "$BRIDGE_NAME" type bridge || exit {{GetCSEErrorCode "ERR_REMOVE_DOCKER_BRIDGE_FAIL"}}
else
# The bridge does not exist
echo "Bridge network $BRIDGE_NAME does not exist"
fi
}

Expand Down Expand Up @@ -618,7 +617,6 @@ configAzurePolicyAddon() {
{{end}}

configAddons() {
echo "configAddons placeholder, keep"
{{if IsClusterAutoscalerAddonEnabled}}
if [[ ${CLUSTER_AUTOSCALER_ADDON} == true ]]; then
configClusterAutoscalerAddon
Expand Down
17 changes: 7 additions & 10 deletions pkg/engine/templates_generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.