openstack/openstack-helm
Code Issues Proposed changes

[ceph] Upgrade Ceph and Rook

Browse Source 
Ceph 19.2.1 contains a critical RGW bug that can lose data. 19.2.2
is a hotfix release to address that issue.

This change updates the Ceph charts to new Ceph 19.2.2 images that
also contain a patch for another RGW bug that was previously
patched onto 19.2.1.

The Rook deployment is also updated to Rook 1.16.6 and is
configured to deploy Ceph 19.2.2.

Change-Id: I05ec9ed447e43a5b36f3004a84eb53cc846bc537
This commit is contained in:
Stephen Taylor 2025-04-14 10:45:41 -06:00
parent 06d7634320
commit 64c1b68645
12 changed files with 33 additions and 33 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:
pull_policy: IfNotPresent
tags:
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.2-1-20250414'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0'
local_registry:

8
ceph-client/values.yaml
View File

@ -24,10 +24,10 @@ release_group: null
images:
pull_policy: IfNotPresent
tags:
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'
ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.2-1-20250414'
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.2-1-20250414'
ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.2-1-20250414'
ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.2-1-20250414'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal'
image_repo_sync: 'docker.io/library/docker:17.07.0'
local_registry:

10
ceph-mon/values.yaml
View File

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

6
ceph-osd/values.yaml
View File

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

4
ceph-provisioners/values.yaml
View File

@ -29,8 +29,8 @@ release_group: null
images:
pull_policy: IfNotPresent
tags:
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_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.2-1-20250414'
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.2-1-20250414'
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'

12
ceph-rgw/values.yaml
View File

@ -24,14 +24,14 @@ release_group: null
images:
pull_policy: IfNotPresent
tags:
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'
ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.2-1-20250414'
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.2-1-20250414'
ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.2-1-20250414'
ceph_rgw_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.2-1-20250414'
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_19.2.1-1-20250207'
rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.1-1-20250207'
rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.2-1-20250414'
rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.2-1-20250414'
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'

8
elasticsearch/values.yaml
View File

@ -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_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
ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.2-1-20250414
s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.2-1-20250414
s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.2-1-20250414
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_19.2.1-1-20250207
snapshot_repository: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.2-1-20250414
elasticsearch_templates: docker.io/openstackhelm/elasticsearch-s3:latest-8_9_0
image_repo_sync: docker.io/library/docker:17.07.0
pull_policy: "IfNotPresent"

2
gnocchi/values.yaml
View File

@ -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_19.2.1-1-20250207
gnocchi_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.2-1-20250414
db_init_indexer: docker.io/library/postgres:9.5
# using non-kolla images until kolla supports postgres as
# an indexer

2
libvirt/values.yaml
View File

@ -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_19.2.1-1-20250207'
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.2-1-20250414'
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

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

@ -15,7 +15,7 @@
set -xe
# Specify the Rook release tag to use for the Rook operator here
ROOK_RELEASE=v1.16.4
ROOK_RELEASE=v1.16.6
: ${CEPH_OSD_DATA_DEVICE:="/dev/loop100"}
@ -182,7 +182,7 @@ monitoring:
pspEnable: false
cephClusterSpec:
cephVersion:
image: quay.io/ceph/ceph:v19.2.1
image: quay.io/ceph/ceph:v19.2.2
allowUnsupported: false
dataDirHostPath: /var/lib/rook
skipUpgradeChecks: false

4
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 Ceph cluster in the ceph namespace using rook-operator.yaml and
# rook-ceph.yaml in the current directory.
ROOK_RELEASE=${ROOK_RELEASE:-1.16.3}
CEPH_RELEASE=${CEPH_RELEASE:-19.2.1}
ROOK_RELEASE=${ROOK_RELEASE:-1.16.6}
CEPH_RELEASE=${CEPH_RELEASE:-19.2.2}
ROOK_CEPH_NAMESPACE=${ROOK_CEPH_NAMESPACE:-rook-ceph}
CEPH_NAMESPACE=${CEPH_NAMESPCE:-ceph}
ROOK_OPERATOR_YAML=${ROOK_OPERATOR_YAML:-/tmp/rook-operator.yaml}

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

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