From 0bf6ec34c2a67122d7426721b24a872797d6d65c Mon Sep 17 00:00:00 2001
From: "SPEARS, DUSTIN (ds443n)" <ds443n@att.com>
Date: Mon, 4 Mar 2024 14:55:16 -0500
Subject: [PATCH] Change NPD version to v0.8.14 for Focal add Jammy image

v0.8.15 is no longer compatible with focal base.
Remove bionic and add jammy dockerfile.

Change-Id: Ib1dbd351730aa3632aed06d848458b8879bc2879
---
 node-problem-detector/Dockerfile.ubuntu_focal               | 2 +-
 .../{Dockerfile.ubuntu_bionic => Dockerfile.ubuntu_jammy}   | 2 +-
 node-problem-detector/build.sh                              | 2 +-
 zuul.d/node-problem-detector.yaml                           | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename node-problem-detector/{Dockerfile.ubuntu_bionic => Dockerfile.ubuntu_jammy} (96%)

diff --git a/node-problem-detector/Dockerfile.ubuntu_focal b/node-problem-detector/Dockerfile.ubuntu_focal
index 1ccd32a1..53f464fe 100644
--- a/node-problem-detector/Dockerfile.ubuntu_focal
+++ b/node-problem-detector/Dockerfile.ubuntu_focal
@@ -1,7 +1,7 @@
 ARG FROM=docker.io/ubuntu:focal
 FROM ${FROM}
 
-ARG NPD_VERSION="v0.8.15"
+ARG NPD_VERSION="v0.8.14"
 ARG NPD_SRC_URL="https://github.com/kubernetes/node-problem-detector/releases/download/${NPD_VERSION}"
 
 RUN apt-get update ;\
diff --git a/node-problem-detector/Dockerfile.ubuntu_bionic b/node-problem-detector/Dockerfile.ubuntu_jammy
similarity index 96%
rename from node-problem-detector/Dockerfile.ubuntu_bionic
rename to node-problem-detector/Dockerfile.ubuntu_jammy
index 68ddaf76..53cce6db 100644
--- a/node-problem-detector/Dockerfile.ubuntu_bionic
+++ b/node-problem-detector/Dockerfile.ubuntu_jammy
@@ -1,4 +1,4 @@
-ARG FROM=docker.io/ubuntu:bionic
+ARG FROM=docker.io/ubuntu:jammy
 FROM ${FROM}
 
 ARG NPD_VERSION="v0.8.15"
diff --git a/node-problem-detector/build.sh b/node-problem-detector/build.sh
index 13acfdee..c0e0e44b 100755
--- a/node-problem-detector/build.sh
+++ b/node-problem-detector/build.sh
@@ -6,7 +6,7 @@ cd ${SCRIPT_DIR}/..
 
 IMAGE="node-problem-detector"
 VERSION=${VERSION:-latest}
-DISTRO=${DISTRO:-ubuntu_focal}
+DISTRO=${DISTRO:-ubuntu_jammy}
 REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"}
 EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""}
 
diff --git a/zuul.d/node-problem-detector.yaml b/zuul.d/node-problem-detector.yaml
index cee827e1..f2c7bfbb 100644
--- a/zuul.d/node-problem-detector.yaml
+++ b/zuul.d/node-problem-detector.yaml
@@ -37,10 +37,10 @@
       docker_images:
         - context: node-problem-detector
           repository: openstackhelm/node-problem-detector
-          dockerfile: Dockerfile.ubuntu_focal
+          dockerfile: Dockerfile.ubuntu_jammy
           tags:
-            - latest-ubuntu_focal
-            - "ubuntu_focal-{{ currentdate }}"
+            - latest-ubuntu_jammy
+            - "ubuntu_jammy-{{ currentdate }}"
     files: &node-problem-detector_files
       - node-problem-detector/.*
       - zuul.d/node-problem-detector.yaml