From 0fff207820a98cb12113e5c1e2ad6abb34b4c0eb Mon Sep 17 00:00:00 2001 From: Sylvain Rabot Date: Sat, 4 Apr 2020 00:17:17 +0200 Subject: [PATCH] fix: disable unattended upgrades during CSE execution (#1681) * fix: disable unattended upgrades during CSE execution Signed-off-by: Sylvain Rabot * style: remove comments to save CSE bytes Co-authored-by: Matt Boersma --- parts/k8s/cloud-init/artifacts/cse_main.sh | 3 +++ parts/k8s/cloud-init/masternodecustomdata.yml | 9 ++++++++ parts/k8s/cloud-init/nodecustomdata.yml | 9 ++++++++ pkg/engine/templates_generated.go | 21 +++++++++++++++++++ 4 files changed, 42 insertions(+) diff --git a/parts/k8s/cloud-init/artifacts/cse_main.sh b/parts/k8s/cloud-init/artifacts/cse_main.sh index b3218f94af..30c4d47407 100755 --- a/parts/k8s/cloud-init/artifacts/cse_main.sh +++ b/parts/k8s/cloud-init/artifacts/cse_main.sh @@ -247,6 +247,9 @@ if $FULL_INSTALL_REQUIRED; then fi {{end}} +{{- /* re-enable unattended upgrades */}} +rm -f /etc/apt/apt.conf.d/99periodic + {{- if not IsAzureStackCloud}} if [[ $OS == $UBUNTU_OS_NAME ]]; then time_metric "PurgeApt" apt_get_purge apache2-utils & diff --git a/parts/k8s/cloud-init/masternodecustomdata.yml b/parts/k8s/cloud-init/masternodecustomdata.yml index f425d723ae..9afe549282 100644 --- a/parts/k8s/cloud-init/masternodecustomdata.yml +++ b/parts/k8s/cloud-init/masternodecustomdata.yml @@ -133,6 +133,15 @@ write_files: {{CloudInitData "aptPreferences"}} {{end}} +- path: /etc/apt/apt.conf.d/99periodic + permissions: "0644" + owner: root + content: | + APT::Periodic::Update-Package-Lists "0"; + APT::Periodic::Download-Upgradeable-Packages "0"; + APT::Periodic::AutocleanInterval "0"; + APT::Periodic::Unattended-Upgrade "0"; + {{if IsIPv6Enabled}} - path: {{GetDHCPv6ServiceCSEScriptFilepath}} permissions: "0644" diff --git a/parts/k8s/cloud-init/nodecustomdata.yml b/parts/k8s/cloud-init/nodecustomdata.yml index cdfcb952b3..0f3dc4a13a 100644 --- a/parts/k8s/cloud-init/nodecustomdata.yml +++ b/parts/k8s/cloud-init/nodecustomdata.yml @@ -127,6 +127,15 @@ write_files: {{CloudInitData "aptPreferences"}} {{end}} +- path: /etc/apt/apt.conf.d/99periodic + permissions: "0644" + owner: root + content: | + APT::Periodic::Update-Package-Lists "0"; + APT::Periodic::Download-Upgradeable-Packages "0"; + APT::Periodic::AutocleanInterval "0"; + APT::Periodic::Unattended-Upgrade "0"; + {{if IsIPv6Enabled}} - path: {{GetDHCPv6ServiceCSEScriptFilepath}} permissions: "0644" diff --git a/pkg/engine/templates_generated.go b/pkg/engine/templates_generated.go index bf80d3a5a1..120bd94f69 100644 --- a/pkg/engine/templates_generated.go +++ b/pkg/engine/templates_generated.go @@ -41272,6 +41272,9 @@ if $FULL_INSTALL_REQUIRED; then fi {{end}} +{{- /* re-enable unattended upgrades */}} +rm -f /etc/apt/apt.conf.d/99periodic + {{- if not IsAzureStackCloud}} if [[ $OS == $UBUNTU_OS_NAME ]]; then time_metric "PurgeApt" apt_get_purge apache2-utils & @@ -42785,6 +42788,15 @@ write_files: {{CloudInitData "aptPreferences"}} {{end}} +- path: /etc/apt/apt.conf.d/99periodic + permissions: "0644" + owner: root + content: | + APT::Periodic::Update-Package-Lists "0"; + APT::Periodic::Download-Upgradeable-Packages "0"; + APT::Periodic::AutocleanInterval "0"; + APT::Periodic::Unattended-Upgrade "0"; + {{if IsIPv6Enabled}} - path: {{GetDHCPv6ServiceCSEScriptFilepath}} permissions: "0644" @@ -43299,6 +43311,15 @@ write_files: {{CloudInitData "aptPreferences"}} {{end}} +- path: /etc/apt/apt.conf.d/99periodic + permissions: "0644" + owner: root + content: | + APT::Periodic::Update-Package-Lists "0"; + APT::Periodic::Download-Upgradeable-Packages "0"; + APT::Periodic::AutocleanInterval "0"; + APT::Periodic::Unattended-Upgrade "0"; + {{if IsIPv6Enabled}} - path: {{GetDHCPv6ServiceCSEScriptFilepath}} permissions: "0644"