From 988b54136a4dfef498074ba4013f752c058cee35 Mon Sep 17 00:00:00 2001
From: Stephen Taylor <stephen.taylor.1@att.com>
Date: Wed, 13 Aug 2025 08:12:11 -0600
Subject: [PATCH] [ceph] Update Ceph images to use Kubernetes 1.33.3

The Ceph images have been on the same Kubernetes version for some
time. This change updates them to the latest.

The ceph-utility build script was found still to reference Focal as
well. That has been updated to Jammy to match the other images.

Signed-off-by: Stephen Taylor <stephen.taylor.1@att.com>
Change-Id: I1c719d9123d4cde760f2d51792b22172e4d7214f
---
 ceph-config-helper/Dockerfile.ubuntu | 2 +-
 ceph-daemon/Dockerfile.ubuntu        | 2 +-
 ceph-utility/Dockerfile.ubuntu       | 4 ++--
 ceph-utility/build.sh                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ceph-config-helper/Dockerfile.ubuntu b/ceph-config-helper/Dockerfile.ubuntu
index 02c9fd8d..ee24ece5 100644
--- a/ceph-config-helper/Dockerfile.ubuntu
+++ b/ceph-config-helper/Dockerfile.ubuntu
@@ -1,7 +1,7 @@
 ARG FROM=docker.io/ubuntu:jammy
 FROM ${FROM}
 
-ARG KUBE_VERSION=1.29.7
+ARG KUBE_VERSION=1.33.3
 
 ARG CEPH_RELEASE
 ARG CEPH_RELEASE_TAG
diff --git a/ceph-daemon/Dockerfile.ubuntu b/ceph-daemon/Dockerfile.ubuntu
index fa2236ba..aee4f4e1 100644
--- a/ceph-daemon/Dockerfile.ubuntu
+++ b/ceph-daemon/Dockerfile.ubuntu
@@ -1,7 +1,7 @@
 ARG FROM=docker.io/ubuntu:jammy
 FROM ${FROM}
 
-ARG KUBE_VERSION=1.31.2
+ARG KUBE_VERSION=1.33.3
 ARG CONFD_VERSION=0.16.0
 
 ARG CEPH_RELEASE
diff --git a/ceph-utility/Dockerfile.ubuntu b/ceph-utility/Dockerfile.ubuntu
index a5704491..43de94fa 100644
--- a/ceph-utility/Dockerfile.ubuntu
+++ b/ceph-utility/Dockerfile.ubuntu
@@ -1,7 +1,7 @@
 ARG FROM=docker.io/ubuntu:jammy
 FROM ${FROM}
 
-ARG KUBE_VERSION=1.29.7
+ARG KUBE_VERSION=1.33.3
 
 ARG CEPH_RELEASE
 ARG CEPH_RELEASE_TAG
@@ -16,7 +16,7 @@ RUN set -ex \
     && apt-get update && apt-get upgrade -y \
     && apt-get install -y \
          ca-certificates \
-         gnupg \
+         gnupg2 \
          curl \
     && curl -fsSL ${CEPH_KEY} | gpg --dearmor -o /etc/apt/keyrings/ceph.acs \
     && DISTRO_VERSION=$(grep '^VERSION_CODENAME=' /etc/os-release | cut -d'=' -f2) \
diff --git a/ceph-utility/build.sh b/ceph-utility/build.sh
index 8040777d..d416d643 100755
--- a/ceph-utility/build.sh
+++ b/ceph-utility/build.sh
@@ -7,7 +7,7 @@ cd ${SCRIPT_DIR}/..
 IMAGE="ceph-utility"
 VERSION=${VERSION:-latest}
 DISTRO=${DISTRO:-ubuntu}
-DISTRO_VERSION=${DISTRO_VERSION:-focal}
+DISTRO_VERSION=${DISTRO_VERSION:-jammy}
 REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"}
 EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""}
 docker build --file=${IMAGE}/Dockerfile.${DISTRO} \