From e26324d5a5be726fb2fb1bc1a6acdf74083bfed8 Mon Sep 17 00:00:00 2001
From: Stephen Taylor <stephen.taylor.1@att.com>
Date: Thu, 23 Jan 2025 12:30:13 -0700
Subject: [PATCH] [ceph] Update Ceph and Rook
This change updates all of the charts that use Ceph images to use
new images based on the Squid 19.2.1 release.
Rook is also updated to 1.16.3 and is configured to deploy Ceph
19.2.1.
Change-Id: Ie2c0353a4bfa181873c98ce5de655c3388aa9574
---
ceph-adapter-rook/values.yaml | 2 +-
ceph-client/values.yaml | 10 +++++-----
ceph-mon/values.yaml | 10 +++++-----
ceph-osd/values.yaml | 6 +++---
ceph-provisioners/values.yaml | 16 ++++++++--------
ceph-rgw/values.yaml | 12 ++++++------
elasticsearch/values.yaml | 8 ++++----
gnocchi/values.yaml | 2 +-
libvirt/values.yaml | 2 +-
roles/deploy-env/tasks/prerequisites.yaml | 2 +-
tools/deployment/ceph/ceph-rook.sh | 4 ++--
tools/deployment/ceph/migrate-to-rook-ceph.sh | 6 ++++--
tools/deployment/ceph/migrate-values.sh | 4 ++--
13 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/ceph-adapter-rook/values.yaml b/ceph-adapter-rook/values.yaml
index bc038e0b8c..65260c7b50 100644
--- a/ceph-adapter-rook/values.yaml
+++ b/ceph-adapter-rook/values.yaml
@@ -2,7 +2,7 @@
images:
pull_policy: IfNotPresent
tags:
- ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312'
+ ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0'
local_registry:
diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml
index 27a4b3a3a7..39ef46f9a1 100644
--- a/ceph-client/values.yaml
+++ b/ceph-client/values.yaml
@@ -24,10 +24,10 @@ release_group: null
images:
pull_policy: IfNotPresent
tags:
- ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312'
- ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312'
- ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312'
- ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312'
+ ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.1-1-20250207'
+ ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
+ ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.1-1-20250207'
+ ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0'
local_registry:
@@ -249,7 +249,7 @@ conf:
# configured here to allow gate scripts to use 1x replication.
# Adding it to /etc/ceph/ceph.conf doesn't seem to be effective.
- config set global mon_allow_pool_size_one true
- - osd require-osd-release reef
+ - osd require-osd-release squid
- status
pool:
# NOTE(portdirect): this drives a simple approximation of
diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml
index 4c39dcfac7..ac65353633 100644
--- a/ceph-mon/values.yaml
+++ b/ceph-mon/values.yaml
@@ -23,11 +23,11 @@ deployment:
images:
pull_policy: IfNotPresent
tags:
- ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312'
- ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312'
- ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312'
- ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312'
- ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312'
+ ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.1-1-20250207'
+ ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
+ ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.1-1-20250207'
+ ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.1-1-20250207'
+ ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0'
local_registry:
diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml
index 27df42d1ac..69a5fb3682 100644
--- a/ceph-osd/values.yaml
+++ b/ceph-osd/values.yaml
@@ -19,9 +19,9 @@
images:
pull_policy: IfNotPresent
tags:
- ceph_osd: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312'
- ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312'
- ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312'
+ ceph_osd: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.1-1-20250207'
+ ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.1-1-20250207'
+ ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0'
local_registry:
diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml
index 493d1ddf00..9a6a766bab 100644
--- a/ceph-provisioners/values.yaml
+++ b/ceph-provisioners/values.yaml
@@ -29,14 +29,14 @@ release_group: null
images:
pull_policy: IfNotPresent
tags:
- ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:uubuntu_jammy_18.2.2-1-20240312'
- ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312'
- csi_provisioner: 'registry.k8s.io/sig-storage/csi-provisioner:v3.1.0'
- csi_snapshotter: 'registry.k8s.io/sig-storage/csi-snapshotter:v6.0.0'
- csi_attacher: 'registry.k8s.io/sig-storage/csi-attacher:v3.4.0'
- csi_resizer: 'registry.k8s.io/sig-storage/csi-resizer:v1.4.0'
- csi_registrar: 'registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0'
- cephcsi: 'quay.io/cephcsi/cephcsi:v3.6.2'
+ ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.1-1-20250207'
+ ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
+ csi_provisioner: 'registry.k8s.io/sig-storage/csi-provisioner:v4.0.1'
+ csi_snapshotter: 'registry.k8s.io/sig-storage/csi-snapshotter:v7.0.2'
+ csi_attacher: 'registry.k8s.io/sig-storage/csi-attacher:v4.5.1'
+ csi_resizer: 'registry.k8s.io/sig-storage/csi-resizer:v1.10.1'
+ csi_registrar: 'registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1'
+ cephcsi: 'quay.io/cephcsi/cephcsi:v3.11.0'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0'
local_registry:
diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index c8ee0a22e3..176f39eeec 100644
--- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml
@@ -24,14 +24,14 @@ release_group: null
images:
pull_policy: IfNotPresent
tags:
- ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312'
- ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312'
- ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312'
- ceph_rgw_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312'
+ ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.1-1-20250207'
+ ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
+ ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.1-1-20250207'
+ ceph_rgw_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0'
- rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312'
- rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312'
+ rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
+ rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
ks_endpoints: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy'
ks_service: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy'
ks_user: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy'
diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index 48a2f1a901..f4bf051ce1 100644
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -21,13 +21,13 @@ images:
memory_init: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
elasticsearch: docker.io/openstackhelm/elasticsearch-s3:latest-8_9_0
curator: docker.io/untergeek/curator:8.0.10
- ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312
- s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312
- s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312
+ ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207
+ s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.1-1-20250207
+ s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207
helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
prometheus_elasticsearch_exporter: quay.io/prometheuscommunity/elasticsearch-exporter:v1.7.0
dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal
- snapshot_repository: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312
+ snapshot_repository: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207
elasticsearch_templates: docker.io/openstackhelm/elasticsearch-s3:latest-8_9_0
image_repo_sync: docker.io/library/docker:17.07.0
pull_policy: "IfNotPresent"
diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml
index 3cc684fc43..ea09efbad7 100644
--- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml
@@ -37,7 +37,7 @@ release_group: null
images:
tags:
dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal
- gnocchi_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312
+ gnocchi_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207
db_init_indexer: docker.io/library/postgres:9.5
# using non-kolla images until kolla supports postgres as
# an indexer
diff --git a/libvirt/values.yaml b/libvirt/values.yaml
index 961133f841..69efc4a198 100644
--- a/libvirt/values.yaml
+++ b/libvirt/values.yaml
@@ -28,7 +28,7 @@ images:
tags:
libvirt: docker.io/openstackhelm/libvirt:latest-ubuntu_focal
libvirt_exporter: vexxhost/libvirtd-exporter:latest
- ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312'
+ ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal
image_repo_sync: docker.io/library/docker:17.07.0
kubectl: docker.io/bitnami/kubectl:latest
diff --git a/roles/deploy-env/tasks/prerequisites.yaml b/roles/deploy-env/tasks/prerequisites.yaml
index f06f889719..e02587c59f 100644
--- a/roles/deploy-env/tasks/prerequisites.yaml
+++ b/roles/deploy-env/tasks/prerequisites.yaml
@@ -18,7 +18,7 @@
- name: Add Ceph apt repository
apt_repository:
- repo: deb https://download.ceph.com/debian-reef/ "{{ ansible_distribution_release }}" main
+ repo: deb https://download.ceph.com/debian-squid/ "{{ ansible_distribution_release }}" main
state: present
filename: ceph
diff --git a/tools/deployment/ceph/ceph-rook.sh b/tools/deployment/ceph/ceph-rook.sh
index 0e5d45c93c..ab210b9edd 100755
--- a/tools/deployment/ceph/ceph-rook.sh
+++ b/tools/deployment/ceph/ceph-rook.sh
@@ -15,7 +15,7 @@
set -xe
# Specify the Rook release tag to use for the Rook operator here
-ROOK_RELEASE=v1.13.3
+ROOK_RELEASE=v1.16.3
: ${CEPH_OSD_DATA_DEVICE:="/dev/loop100"}
@@ -387,7 +387,7 @@ monitoring:
pspEnable: false
cephClusterSpec:
cephVersion:
- image: quay.io/ceph/ceph:v18.2.0
+ image: quay.io/ceph/ceph:v19.2.1
allowUnsupported: false
dataDirHostPath: /var/lib/rook
skipUpgradeChecks: false
diff --git a/tools/deployment/ceph/migrate-to-rook-ceph.sh b/tools/deployment/ceph/migrate-to-rook-ceph.sh
index e970037370..11f361dc74 100755
--- a/tools/deployment/ceph/migrate-to-rook-ceph.sh
+++ b/tools/deployment/ceph/migrate-to-rook-ceph.sh
@@ -21,8 +21,8 @@ set -x
# The default values deploy the Rook operator in the rook-ceph namespace and
# the Ceph cluster in the ceph namespace using rook-operator.yaml and
# rook-ceph.yaml in the current directory.
-ROOK_RELEASE=${ROOK_RELEASE:-1.13.7}
-CEPH_RELEASE=${CEPH_RELEASE:-18.2.2}
+ROOK_RELEASE=${ROOK_RELEASE:-1.16.3}
+CEPH_RELEASE=${CEPH_RELEASE:-19.2.1}
ROOK_CEPH_NAMESPACE=${ROOK_CEPH_NAMESPACE:-rook-ceph}
CEPH_NAMESPACE=${CEPH_NAMESPCE:-ceph}
ROOK_OPERATOR_YAML=${ROOK_OPERATOR_YAML:-/tmp/rook-operator.yaml}
@@ -51,6 +51,7 @@ function wait_for_initial_rook_deployment() {
"$(app_status rook-ceph-osd-prepare)" != "Succeeded" ]]
do
echo "Waiting for INITIAL Rook Ceph deployment ..."
+ kubectl -n ${CEPH_NAMESPACE} get pods
sleep 5
done
set -x
@@ -75,6 +76,7 @@ function wait_for_full_rook_deployment() {
"$(app_status rook-ceph-rgw)" != "Running" ]]
do
echo "Waiting for FULL Rook Ceph deployment ..."
+ kubectl -n ${CEPH_NAMESPACE} get pods
sleep 5
done
set -x
diff --git a/tools/deployment/ceph/migrate-values.sh b/tools/deployment/ceph/migrate-values.sh
index 5c956b298b..e81ee444ac 100755
--- a/tools/deployment/ceph/migrate-values.sh
+++ b/tools/deployment/ceph/migrate-values.sh
@@ -14,7 +14,7 @@
set -xe
-ROOK_RELEASE=v1.13.3
+ROOK_RELEASE=v1.16.3
: ${CEPH_OSD_DATA_DEVICE:="/dev/loop100"}
@@ -368,7 +368,7 @@ monitoring:
pspEnable: false
cephClusterSpec:
cephVersion:
- image: quay.io/ceph/ceph:v18.2.0
+ image: quay.io/ceph/ceph:v19.2.1
allowUnsupported: false
dataDirHostPath: /var/lib/rook
skipUpgradeChecks: false