openstack/openstack-helm-images
Code Issues Proposed changes

[ceph] Update Ceph images to use Kubernetes 1.33.3

Browse Source 
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
This commit is contained in:
Stephen Taylor
2025-08-13 08:12:11 -06:00
parent c7ca344333
commit 988b54136a
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ceph-config-helper/Dockerfile.ubuntu
View File

@@ -1,7 +1,7 @@
ARG FROM=docker.io/ubuntu:jammy ARG FROM=docker.io/ubuntu:jammy
FROM ${FROM} FROM ${FROM}
ARG KUBE_VERSION=1.29.7 ARG KUBE_VERSION=1.33.3
ARG CEPH_RELEASE ARG CEPH_RELEASE
ARG CEPH_RELEASE_TAG ARG CEPH_RELEASE_TAG

2
ceph-daemon/Dockerfile.ubuntu
View File

@@ -1,7 +1,7 @@
ARG FROM=docker.io/ubuntu:jammy ARG FROM=docker.io/ubuntu:jammy
FROM ${FROM} FROM ${FROM}
ARG KUBE_VERSION=1.31.2 ARG KUBE_VERSION=1.33.3
ARG CONFD_VERSION=0.16.0 ARG CONFD_VERSION=0.16.0
ARG CEPH_RELEASE ARG CEPH_RELEASE

4
ceph-utility/Dockerfile.ubuntu
View File

@@ -1,7 +1,7 @@
ARG FROM=docker.io/ubuntu:jammy ARG FROM=docker.io/ubuntu:jammy
FROM ${FROM} FROM ${FROM}
ARG KUBE_VERSION=1.29.7 ARG KUBE_VERSION=1.33.3
ARG CEPH_RELEASE ARG CEPH_RELEASE
ARG CEPH_RELEASE_TAG ARG CEPH_RELEASE_TAG
@@ -16,7 +16,7 @@ RUN set -ex \
&& apt-get update && apt-get upgrade -y \ && apt-get update && apt-get upgrade -y \
&& apt-get install -y \ && apt-get install -y \
ca-certificates \ ca-certificates \
gnupg \ gnupg2 \
curl \ curl \
&& curl -fsSL ${CEPH_KEY} | gpg --dearmor -o /etc/apt/keyrings/ceph.acs \ && curl -fsSL ${CEPH_KEY} | gpg --dearmor -o /etc/apt/keyrings/ceph.acs \
&& DISTRO_VERSION=$(grep '^VERSION_CODENAME=' /etc/os-release | cut -d'=' -f2) \ && DISTRO_VERSION=$(grep '^VERSION_CODENAME=' /etc/os-release | cut -d'=' -f2) \

2
ceph-utility/build.sh
View File

@@ -7,7 +7,7 @@ cd ${SCRIPT_DIR}/..
IMAGE="ceph-utility" IMAGE="ceph-utility"
VERSION=${VERSION:-latest} VERSION=${VERSION:-latest}
DISTRO=${DISTRO:-ubuntu} DISTRO=${DISTRO:-ubuntu}
DISTRO_VERSION=${DISTRO_VERSION:-focal} DISTRO_VERSION=${DISTRO_VERSION:-jammy}
REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"} REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"}
EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""} EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""}
docker build --file=${IMAGE}/Dockerfile.${DISTRO} \ docker build --file=${IMAGE}/Dockerfile.${DISTRO} \