From 64c1b68645517e7a6f75e419192cd7422ea41320 Mon Sep 17 00:00:00 2001 From: Stephen Taylor Date: Mon, 14 Apr 2025 10:45:41 -0600 Subject: [PATCH] [ceph] Upgrade Ceph and Rook 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 --- ceph-adapter-rook/values.yaml | 2 +- ceph-client/values.yaml | 8 ++++---- ceph-mon/values.yaml | 10 +++++----- ceph-osd/values.yaml | 6 +++--- ceph-provisioners/values.yaml | 4 ++-- ceph-rgw/values.yaml | 12 ++++++------ elasticsearch/values.yaml | 8 ++++---- gnocchi/values.yaml | 2 +- libvirt/values.yaml | 2 +- tools/deployment/ceph/ceph-rook.sh | 4 ++-- tools/deployment/ceph/migrate-to-rook-ceph.sh | 4 ++-- tools/deployment/ceph/migrate-values.sh | 4 ++-- 12 files changed, 33 insertions(+), 33 deletions(-) diff --git a/ceph-adapter-rook/values.yaml b/ceph-adapter-rook/values.yaml index 65260c7b50..578db1b31a 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_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: diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml index 39ef46f9a1..7e882efcf8 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_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: diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml index ac65353633..3ad882d1ab 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_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: diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml index 69a5fb3682..edcc147d26 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_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: diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml index 9a6a766bab..ec5feb2e8d 100644 --- a/ceph-provisioners/values.yaml +++ b/ceph-provisioners/values.yaml @@ -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' diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml index 176f39eeec..3f3bbc6d01 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_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' diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index f4bf051ce1..d11ec915cb 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_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" diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml index ea09efbad7..f33e5de079 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_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 diff --git a/libvirt/values.yaml b/libvirt/values.yaml index 69efc4a198..4ce6f990f7 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_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 diff --git a/tools/deployment/ceph/ceph-rook.sh b/tools/deployment/ceph/ceph-rook.sh index 1d949b0143..6a514d7fdb 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.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 diff --git a/tools/deployment/ceph/migrate-to-rook-ceph.sh b/tools/deployment/ceph/migrate-to-rook-ceph.sh index 11f361dc74..beed634629 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.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} diff --git a/tools/deployment/ceph/migrate-values.sh b/tools/deployment/ceph/migrate-values.sh index e81ee444ac..c866ae578d 100755 --- a/tools/deployment/ceph/migrate-values.sh +++ b/tools/deployment/ceph/migrate-values.sh @@ -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