move chrony installation out of containerD block (#646)

Co-authored-by: Adil Adilli <[email protected]>

parts/linux/cloud-init/artifacts/ubuntu/cse_install_ubuntu.sh

@@ -87,27 +87,6 @@ getMobyPkg() {
     apt_get_update || exit $ERR_APT_UPDATE_TIMEOUT
 }
 
-{{- if NeedsContainerd}}
-# CSE+VHD can dictate the containerd version, users don't care as long as it works
-installStandaloneContainerd() {
-    # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here.
-    CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1)
-    # v1.4.1 is our lowest supported version of containerd
-    local CONTAINERD_VERSION="1.4.3"
-    if semverCompare ${CURRENT_VERSION:-"0.0.0"} ${CONTAINERD_VERSION}; then
-        echo "currently installed containerd version ${CURRENT_VERSION} is greater than (or equal to) target base version ${CONTAINERD_VERSION}. skipping installStandaloneContainerd."
-    else
-        echo "installing containerd version ${CONTAINERD_VERSION}"
-        removeMoby
-        removeContainerd
-        downloadContainerd ${CONTAINERD_VERSION}
-        wait_for_apt_locks
-        retrycmd_if_failure 10 5 600 apt-get -y -f install ${CONTAINERD_DEB_FILE} || exit $ERR_CONTAINERD_INSTALL_TIMEOUT
-        rm -Rf $CONTAINERD_DOWNLOADS_DIR &
-    fi
-}
-
-
 disableNtpAndTimesyncdInstallChrony() {
     # Disable systemd-timesyncd
     sudo systemctl stop systemd-timesyncd
@@ -170,6 +149,26 @@ EOF
     systemctl restart chrony
 }
 
+{{- if NeedsContainerd}}
+# CSE+VHD can dictate the containerd version, users don't care as long as it works
+installStandaloneContainerd() {
+    # azure-built runtimes have a "+azure" suffix in their version strings (i.e 1.4.1+azure). remove that here.
+    CURRENT_VERSION=$(containerd -version | cut -d " " -f 3 | sed 's|v||' | cut -d "+" -f 1)
+    # v1.4.1 is our lowest supported version of containerd
+    local CONTAINERD_VERSION="1.4.3"
+    if semverCompare ${CURRENT_VERSION:-"0.0.0"} ${CONTAINERD_VERSION}; then
+        echo "currently installed containerd version ${CURRENT_VERSION} is greater than (or equal to) target base version ${CONTAINERD_VERSION}. skipping installStandaloneContainerd."
+    else
+        echo "installing containerd version ${CONTAINERD_VERSION}"
+        removeMoby
+        removeContainerd
+        downloadContainerd ${CONTAINERD_VERSION}
+        wait_for_apt_locks
+        retrycmd_if_failure 10 5 600 apt-get -y -f install ${CONTAINERD_DEB_FILE} || exit $ERR_CONTAINERD_INSTALL_TIMEOUT
+        rm -Rf $CONTAINERD_DOWNLOADS_DIR &
+    fi
+}
+
 downloadContainerd() {
     CONTAINERD_VERSION=$1
     # currently upstream maintains the package on a storage endpoint rather than an actual apt repo

pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/CustomData

@@ -45,7 +45,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh

pkg/agent/testdata/AKSUbuntu1604+CustomKubeletConfig+CustomLinuxOSConfig/line48.sh

@@ -87,6 +87,68 @@ getMobyPkg() {
     apt_get_update || exit $ERR_APT_UPDATE_TIMEOUT
 }
 
+disableNtpAndTimesyncdInstallChrony() {
+    # Disable systemd-timesyncd
+    sudo systemctl stop systemd-timesyncd
+    sudo systemctl disable systemd-timesyncd
+    # Disable ntp
+    sudo systemctl stop ntp
+    sudo systemctl disable ntp
+
+    # Install chrony
+    apt-get update
+    apt-get install chrony -y
+    cat > /etc/chrony/chrony.conf <<EOF
+# Welcome to the chrony configuration file. See chrony.conf(5) for more
+# information about usuable directives.
+
+# This will use (up to):
+# - 4 sources from ntp.ubuntu.com which some are ipv6 enabled
+# - 2 sources from 2.ubuntu.pool.ntp.org which is ipv6 enabled as well
+# - 1 source from [01].ubuntu.pool.ntp.org each (ipv4 only atm)
+# This means by default, up to 6 dual-stack and up to 2 additional IPv4-only
+# sources will be used.
+# At the same time it retains some protection against one of the entries being
+# down (compare to just using one of the lines). See (LP: #1754358) for the
+# discussion.
+#
+# About using servers from the NTP Pool Project in general see (LP: #104525).
+# Approved by Ubuntu Technical Board on 2011-02-08.
+# See http://www.pool.ntp.org/join.html for more information.
+#pool ntp.ubuntu.com        iburst maxsources 4
+#pool 0.ubuntu.pool.ntp.org iburst maxsources 1
+#pool 1.ubuntu.pool.ntp.org iburst maxsources 1
+#pool 2.ubuntu.pool.ntp.org iburst maxsources 2
+
+# This directive specify the location of the file containing ID/key pairs for
+# NTP authentication.
+keyfile /etc/chrony/chrony.keys
+
+# This directive specify the file into which chronyd will store the rate
+# information.
+driftfile /var/lib/chrony/chrony.drift
+
+# Uncomment the following line to turn logging on.
+#log tracking measurements statistics
+
+# Log files location.
+logdir /var/log/chrony
+
+# Stop bad estimates upsetting machine clock.
+maxupdateskew 100.0
+
+# This directive enables kernel synchronisation (every 11 minutes) of the
+# real-time clock. Note that it can’t be used along with the 'rtcfile' directive.
+rtcsync
+
+# Settings come from: https://docs.microsoft.com/en-us/azure/virtual-machines/linux/time-sync
+refclock PHC /dev/ptp0 poll 3 dpoll -2 offset 0
+makestep 1.0 -1
+EOF
+
+    systemctl restart chrony
+}
+
 installMoby() {
     CURRENT_VERSION=$(dockerd --version | grep "Docker version" | cut -d "," -f 1 | cut -d " " -f 3 | cut -d "+" -f 1)
     local MOBY_VERSION="19.03.14"

pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/CustomData

@@ -45,7 +45,7 @@ write_files:
   encoding: gzip
   owner: root
   content: !!binary |
-    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
+    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
 
 
 - path: /opt/azure/containers/provision_configs.sh

pkg/agent/testdata/AKSUbuntu1604+Disable1804SystemdResolved=false/line48.sh

@@ -87,6 +87,68 @@ getMobyPkg() {
     apt_get_update || exit $ERR_APT_UPDATE_TIMEOUT
 }
 
+disableNtpAndTimesyncdInstallChrony() {
+    # Disable systemd-timesyncd
+    sudo systemctl stop systemd-timesyncd
+    sudo systemctl disable systemd-timesyncd
+    # Disable ntp
+    sudo systemctl stop ntp
+    sudo systemctl disable ntp
+
+    # Install chrony
+    apt-get update
+    apt-get install chrony -y
+    cat > /etc/chrony/chrony.conf <<EOF
+# Welcome to the chrony configuration file. See chrony.conf(5) for more
+# information about usuable directives.
+
+# This will use (up to):
+# - 4 sources from ntp.ubuntu.com which some are ipv6 enabled
+# - 2 sources from 2.ubuntu.pool.ntp.org which is ipv6 enabled as well
+# - 1 source from [01].ubuntu.pool.ntp.org each (ipv4 only atm)
+# This means by default, up to 6 dual-stack and up to 2 additional IPv4-only
+# sources will be used.
+# At the same time it retains some protection against one of the entries being
+# down (compare to just using one of the lines). See (LP: #1754358) for the
+# discussion.
+#
+# About using servers from the NTP Pool Project in general see (LP: #104525).
+# Approved by Ubuntu Technical Board on 2011-02-08.
+# See http://www.pool.ntp.org/join.html for more information.
+#pool ntp.ubuntu.com        iburst maxsources 4
+#pool 0.ubuntu.pool.ntp.org iburst maxsources 1
+#pool 1.ubuntu.pool.ntp.org iburst maxsources 1
+#pool 2.ubuntu.pool.ntp.org iburst maxsources 2
+
+# This directive specify the location of the file containing ID/key pairs for
+# NTP authentication.
+keyfile /etc/chrony/chrony.keys
+
+# This directive specify the file into which chronyd will store the rate
+# information.
+driftfile /var/lib/chrony/chrony.drift
+
+# Uncomment the following line to turn logging on.
+#log tracking measurements statistics
+
+# Log files location.
+logdir /var/log/chrony
+
+# Stop bad estimates upsetting machine clock.
+maxupdateskew 100.0
+
+# This directive enables kernel synchronisation (every 11 minutes) of the
+# real-time clock. Note that it can’t be used along with the 'rtcfile' directive.
+rtcsync
+
+# Settings come from: https://docs.microsoft.com/en-us/azure/virtual-machines/linux/time-sync
+refclock PHC /dev/ptp0 poll 3 dpoll -2 offset 0
+makestep 1.0 -1
+EOF
+
+    systemctl restart chrony
+}
+
 installMoby() {
     CURRENT_VERSION=$(dockerd --version | grep "Docker version" | cut -d "," -f 1 | cut -d " " -f 3 | cut -d "+" -f 1)
     local MOBY_VERSION="19.03.14"