From f0d909d7c3fca445814be033f0d40881dc529ad7 Mon Sep 17 00:00:00 2001
From: "Dr. Jens Harbott" <harbott@osism.tech>
Date: Wed, 17 Apr 2024 11:17:42 +0200
Subject: [PATCH] Support Ubuntu 24.04 in nodepool elements

Extend all the tweaks that we have for Ubuntu 22.04 also apply to the
next LTS release.

Change-Id: Id62d39ba4b2af5f5ffd395b97a5187f5082bd4b0
---
 nodepool/elements/infra-package-needs/pkg-map                 | 4 ++++
 .../post-install.d/80-enable-infra-services                   | 2 +-
 nodepool/elements/nodepool-base/root.d/60-apt-phased-updates  | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nodepool/elements/infra-package-needs/pkg-map b/nodepool/elements/infra-package-needs/pkg-map
index 5e20360d1a..2742099cc1 100644
--- a/nodepool/elements/infra-package-needs/pkg-map
+++ b/nodepool/elements/infra-package-needs/pkg-map
@@ -38,6 +38,10 @@
       "jammy": {
         "ntp": "",
         "ntpdate": ""
+      },
+      "noble": {
+        "ntp": "",
+        "ntpdate": ""
       }
    }
   },
diff --git a/nodepool/elements/infra-package-needs/post-install.d/80-enable-infra-services b/nodepool/elements/infra-package-needs/post-install.d/80-enable-infra-services
index dc03bd6e21..cb8767e31f 100755
--- a/nodepool/elements/infra-package-needs/post-install.d/80-enable-infra-services
+++ b/nodepool/elements/infra-package-needs/post-install.d/80-enable-infra-services
@@ -13,7 +13,7 @@ case "$DIB_INIT_SYSTEM" in
         ;;
     systemd)
         # stick with default systemd timesyncd on bookworm, focal and beyond
-        if [[ ":bookworm: :focal: :jammy:" =~ :${DIB_RELEASE}: ]]; then
+        if [[ ":bookworm: :focal: :jammy: :noble:" =~ :${DIB_RELEASE}: ]]; then
             exit 0
         elif [[ $DISTRO_NAME = "ubuntu" || $DISTRO_NAME = "debian" ]]; then
             systemctl enable ntp.service
diff --git a/nodepool/elements/nodepool-base/root.d/60-apt-phased-updates b/nodepool/elements/nodepool-base/root.d/60-apt-phased-updates
index d532cbac3f..16edd963f5 100755
--- a/nodepool/elements/nodepool-base/root.d/60-apt-phased-updates
+++ b/nodepool/elements/nodepool-base/root.d/60-apt-phased-updates
@@ -23,7 +23,7 @@ set -o pipefail
 
 # NOTE(frickler): Our images builds always install the newest updates,
 # so we need this in order to avoid conflicts
-if [ ${DIB_RELEASE} = jammy ]; then
+if [[ ":jammy: :noble:" =~ :${DIB_RELEASE}: ]]; then
     if [ -d "$TARGET_ROOT/etc/apt/apt.conf.d" ]; then
         echo "APT::Get::Always-Include-Phased-Updates \"true\";" | sudo tee $TARGET_ROOT/etc/apt/apt.conf.d/95phased-updates
     fi