openstack/openstack-helm-infra
Code Issues Proposed changes

[ceph] Update Ceph and Rook

Browse Source 
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
This commit is contained in:
Stephen Taylor 2025-01-23 12:30:13 -07:00
parent 7f9b4fb013
commit e26324d5a5
13 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph-adapter-rook/values.yaml
View File

@ -2,7 +2,7 @@
images: images:
pull_policy: IfNotPresent pull_policy: IfNotPresent
tags: 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' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0' image_repo_sync: 'docker.io/library/docker:17.07.0'
local_registry: local_registry:

10
ceph-client/values.yaml
View File

@ -24,10 +24,10 @@ release_group: null
images: images:
pull_policy: IfNotPresent pull_policy: IfNotPresent
tags: tags:
ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon: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_18.2.2-1-20240312' 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_18.2.2-1-20240312' 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_18.2.2-1-20240312' 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' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0' image_repo_sync: 'docker.io/library/docker:17.07.0'
local_registry: local_registry:
@ -249,7 +249,7 @@ conf:
# configured here to allow gate scripts to use 1x replication. # configured here to allow gate scripts to use 1x replication.
# Adding it to /etc/ceph/ceph.conf doesn't seem to be effective. # Adding it to /etc/ceph/ceph.conf doesn't seem to be effective.
- config set global mon_allow_pool_size_one true - config set global mon_allow_pool_size_one true
- osd require-osd-release reef - osd require-osd-release squid
- status - status
pool: pool:
# NOTE(portdirect): this drives a simple approximation of # NOTE(portdirect): this drives a simple approximation of

10
ceph-mon/values.yaml
View File

@ -23,11 +23,11 @@ deployment:
images: images:
pull_policy: IfNotPresent pull_policy: IfNotPresent
tags: tags:
ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon: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_18.2.2-1-20240312' 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_18.2.2-1-20240312' ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.1-1-20250207'
ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_18.2.2-1-20240312' 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_18.2.2-1-20240312' 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' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0' image_repo_sync: 'docker.io/library/docker:17.07.0'
local_registry: local_registry:

6
ceph-osd/values.yaml
View File

@ -19,9 +19,9 @@
images: images:
pull_policy: IfNotPresent pull_policy: IfNotPresent
tags: tags:
ceph_osd: 'docker.io/openstackhelm/ceph-daemon: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_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_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' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0' image_repo_sync: 'docker.io/library/docker:17.07.0'
local_registry: local_registry:

16
ceph-provisioners/values.yaml
View File

@ -29,14 +29,14 @@ release_group: null
images: images:
pull_policy: IfNotPresent pull_policy: IfNotPresent
tags: tags:
ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:uubuntu_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_18.2.2-1-20240312' 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:v3.1.0' csi_provisioner: 'registry.k8s.io/sig-storage/csi-provisioner:v4.0.1'
csi_snapshotter: 'registry.k8s.io/sig-storage/csi-snapshotter:v6.0.0' csi_snapshotter: 'registry.k8s.io/sig-storage/csi-snapshotter:v7.0.2'
csi_attacher: 'registry.k8s.io/sig-storage/csi-attacher:v3.4.0' csi_attacher: 'registry.k8s.io/sig-storage/csi-attacher:v4.5.1'
csi_resizer: 'registry.k8s.io/sig-storage/csi-resizer:v1.4.0' csi_resizer: 'registry.k8s.io/sig-storage/csi-resizer:v1.10.1'
csi_registrar: 'registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.5.0' csi_registrar: 'registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1'
cephcsi: 'quay.io/cephcsi/cephcsi:v3.6.2' cephcsi: 'quay.io/cephcsi/cephcsi:v3.11.0'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0' image_repo_sync: 'docker.io/library/docker:17.07.0'
local_registry: local_registry:

12
ceph-rgw/values.yaml
View File

@ -24,14 +24,14 @@ release_group: null
images: images:
pull_policy: IfNotPresent pull_policy: IfNotPresent
tags: tags:
ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon: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_18.2.2-1-20240312' 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_18.2.2-1-20240312' 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_18.2.2-1-20240312' 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' dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0' 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_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_18.2.2-1-20240312' 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_endpoints: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy'
ks_service: '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' ks_user: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy'

8
elasticsearch/values.yaml
View File

@ -21,13 +21,13 @@ images:
memory_init: docker.io/openstackhelm/heat:wallaby-ubuntu_focal memory_init: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
elasticsearch: docker.io/openstackhelm/elasticsearch-s3:latest-8_9_0 elasticsearch: docker.io/openstackhelm/elasticsearch-s3:latest-8_9_0
curator: docker.io/untergeek/curator:8.0.10 curator: docker.io/untergeek/curator:8.0.10
ceph_key_placement: 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_18.2.2-1-20240312 s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.1-1-20250207
s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312 s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207
helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
prometheus_elasticsearch_exporter: quay.io/prometheuscommunity/elasticsearch-exporter:v1.7.0 prometheus_elasticsearch_exporter: quay.io/prometheuscommunity/elasticsearch-exporter:v1.7.0
dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal 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 elasticsearch_templates: docker.io/openstackhelm/elasticsearch-s3:latest-8_9_0
image_repo_sync: docker.io/library/docker:17.07.0 image_repo_sync: docker.io/library/docker:17.07.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"

2
gnocchi/values.yaml
View File

@ -37,7 +37,7 @@ release_group: null
images: images:
tags: tags:
dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal 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 db_init_indexer: docker.io/library/postgres:9.5
# using non-kolla images until kolla supports postgres as # using non-kolla images until kolla supports postgres as
# an indexer # an indexer

2
libvirt/values.yaml
View File

@ -28,7 +28,7 @@ images:
tags: tags:
libvirt: docker.io/openstackhelm/libvirt:latest-ubuntu_focal libvirt: docker.io/openstackhelm/libvirt:latest-ubuntu_focal
libvirt_exporter: vexxhost/libvirtd-exporter:latest 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 dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal
image_repo_sync: docker.io/library/docker:17.07.0 image_repo_sync: docker.io/library/docker:17.07.0
kubectl: docker.io/bitnami/kubectl:latest kubectl: docker.io/bitnami/kubectl:latest

2
roles/deploy-env/tasks/prerequisites.yaml
View File

@ -18,7 +18,7 @@
- name: Add Ceph apt repository - name: Add Ceph apt repository
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 state: present
filename: ceph filename: ceph

4
tools/deployment/ceph/ceph-rook.sh
View File

@ -15,7 +15,7 @@
set -xe set -xe
# Specify the Rook release tag to use for the Rook operator here # 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"} : ${CEPH_OSD_DATA_DEVICE:="/dev/loop100"}
@ -387,7 +387,7 @@ monitoring:
pspEnable: false pspEnable: false
cephClusterSpec: cephClusterSpec:
cephVersion: cephVersion:
image: quay.io/ceph/ceph:v18.2.0 image: quay.io/ceph/ceph:v19.2.1
allowUnsupported: false allowUnsupported: false
dataDirHostPath: /var/lib/rook dataDirHostPath: /var/lib/rook
skipUpgradeChecks: false skipUpgradeChecks: false

6
tools/deployment/ceph/migrate-to-rook-ceph.sh
View File

@ -21,8 +21,8 @@ set -x
# The default values deploy the Rook operator in the rook-ceph namespace and # 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 # the Ceph cluster in the ceph namespace using rook-operator.yaml and
# rook-ceph.yaml in the current directory. # rook-ceph.yaml in the current directory.
ROOK_RELEASE=${ROOK_RELEASE:-1.13.7} ROOK_RELEASE=${ROOK_RELEASE:-1.16.3}
CEPH_RELEASE=${CEPH_RELEASE:-18.2.2} CEPH_RELEASE=${CEPH_RELEASE:-19.2.1}
ROOK_CEPH_NAMESPACE=${ROOK_CEPH_NAMESPACE:-rook-ceph} ROOK_CEPH_NAMESPACE=${ROOK_CEPH_NAMESPACE:-rook-ceph}
CEPH_NAMESPACE=${CEPH_NAMESPCE:-ceph} CEPH_NAMESPACE=${CEPH_NAMESPCE:-ceph}
ROOK_OPERATOR_YAML=${ROOK_OPERATOR_YAML:-/tmp/rook-operator.yaml} 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" ]] "$(app_status rook-ceph-osd-prepare)" != "Succeeded" ]]
do do
echo "Waiting for INITIAL Rook Ceph deployment ..." echo "Waiting for INITIAL Rook Ceph deployment ..."
kubectl -n ${CEPH_NAMESPACE} get pods
sleep 5 sleep 5
done done
set -x set -x
@ -75,6 +76,7 @@ function wait_for_full_rook_deployment() {
"$(app_status rook-ceph-rgw)" != "Running" ]] "$(app_status rook-ceph-rgw)" != "Running" ]]
do do
echo "Waiting for FULL Rook Ceph deployment ..." echo "Waiting for FULL Rook Ceph deployment ..."
kubectl -n ${CEPH_NAMESPACE} get pods
sleep 5 sleep 5
done done
set -x set -x

4
tools/deployment/ceph/migrate-values.sh
View File

@ -14,7 +14,7 @@
set -xe set -xe
ROOK_RELEASE=v1.13.3 ROOK_RELEASE=v1.16.3
: ${CEPH_OSD_DATA_DEVICE:="/dev/loop100"} : ${CEPH_OSD_DATA_DEVICE:="/dev/loop100"}
@ -368,7 +368,7 @@ monitoring:
pspEnable: false pspEnable: false
cephClusterSpec: cephClusterSpec:
cephVersion: cephVersion:
image: quay.io/ceph/ceph:v18.2.0 image: quay.io/ceph/ceph:v19.2.1
allowUnsupported: false allowUnsupported: false
dataDirHostPath: /var/lib/rook dataDirHostPath: /var/lib/rook
skipUpgradeChecks: false skipUpgradeChecks: false