Update Ceph to Tentacle 20.2.0 and Rook to 1.18.9

This change replaces all of the Ceph Squid 19.2.3 images with Ceph
Tentacle 20.2.0 images and sets the ceph-osd minimum version to
"tentacle." The Rook version is also bumped from 1.18.8 to the
latest 1.18.9 in the deployment scripts.

As part of this process, Ceph image sources from
docker.io/openstackhelm have also been replaced with
quay.io/airshipit.

Signed-off-by: Stephen Taylor <stephen.taylor.1@att.com>
Change-Id: I49a9f505ead27508dbb4f3e6ada5b1f4358cc021
This commit is contained in:
Stephen Taylor
2026-01-16 08:43:01 -07:00
parent 14d8804e1b
commit aed8f58261
31 changed files with 111 additions and 41 deletions

View File

@@ -2,7 +2,7 @@
images:
pull_policy: IfNotPresent
tags:
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
ceph_config_helper: 'quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy'
image_repo_sync: 'quay.io/airshipit/docker:27.5.0'
local_registry:

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.3-1-20250805'
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.3-1-20250805'
ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
ceph_bootstrap: 'quay.io/airshipit/ceph-daemon:ubuntu_jammy_20.2.0-1-20260116'
ceph_config_helper: 'quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116'
ceph_mds: 'quay.io/airshipit/ceph-daemon:ubuntu_jammy_20.2.0-1-20260116'
ceph_rbd_pool: 'quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy'
image_repo_sync: 'quay.io/airshipit/docker:27.5.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 squid
- osd require-osd-release tentacle
- status
pool:
# NOTE(portdirect): this drives a simple approximation of

View File

@@ -23,11 +23,11 @@ deployment:
images:
pull_policy: IfNotPresent
tags:
ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.3-1-20250805'
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.3-1-20250805'
ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.3-1-20250805'
ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
ceph_bootstrap: 'quay.io/airshipit/ceph-daemon:ubuntu_jammy_20.2.0-1-20260116'
ceph_config_helper: 'quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116'
ceph_mon: 'quay.io/airshipit/ceph-daemon:ubuntu_jammy_20.2.0-1-20260116'
ceph_mgr: 'quay.io/airshipit/ceph-daemon:ubuntu_jammy_20.2.0-1-20260116'
ceph_mon_check: 'quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy'
image_repo_sync: 'quay.io/airshipit/docker:27.5.0'
local_registry:

View File

@@ -19,9 +19,9 @@
images:
pull_policy: IfNotPresent
tags:
ceph_osd: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.3-1-20250805'
ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.3-1-20250805'
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
ceph_osd: 'quay.io/airshipit/ceph-daemon:ubuntu_jammy_20.2.0-1-20260116'
ceph_bootstrap: 'quay.io/airshipit/ceph-daemon:ubuntu_jammy_20.2.0-1-20260116'
ceph_config_helper: 'quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy'
image_repo_sync: 'quay.io/airshipit/docker:27.5.0'
local_registry:

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.3-1-20250805'
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
ceph_bootstrap: 'quay.io/airshipit/ceph-daemon:ubuntu_jammy_20.2.0-1-20260116'
ceph_config_helper: 'quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116'
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'

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.3-1-20250805'
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.3-1-20250805'
ceph_rgw_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
ceph_bootstrap: 'quay.io/airshipit/ceph-daemon:ubuntu_jammy_20.2.0-1-20260116'
ceph_config_helper: 'quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116'
ceph_rgw: 'quay.io/airshipit/ceph-daemon:ubuntu_jammy_20.2.0-1-20260116'
ceph_rgw_pool: 'quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy'
image_repo_sync: 'quay.io/airshipit/docker:27.5.0'
rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
rgw_s3_admin: 'quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116'
rgw_placement_targets: 'quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116'
ks_endpoints: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble'
ks_service: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble'
ks_user: 'quay.io/airshipit/openstack-client:2025.1-ubuntu_noble'

View File

@@ -13,7 +13,7 @@
images:
tags:
cert_rotation: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy'
cert_rotation: 'quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy'
dep_check: 'quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy'
local_registry:
active: false

View File

@@ -56,9 +56,9 @@ images:
cinder_volume: quay.io/airshipit/cinder:2025.1-ubuntu_noble
cinder_volume_usage_audit: quay.io/airshipit/cinder:2025.1-ubuntu_noble
cinder_db_purge: quay.io/airshipit/cinder:2025.1-ubuntu_noble
cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy
cinder_storage_init: quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy
cinder_backup: quay.io/airshipit/cinder:2025.1-ubuntu_noble
cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy
cinder_backup_storage_init: quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy
dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
image_repo_sync: docker.io/docker:17.07.0
pull_policy: "IfNotPresent"

View File

@@ -21,13 +21,13 @@ images:
memory_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
elasticsearch: docker.elastic.co/elasticsearch/elasticsearch:8.19.9
curator: docker.io/untergeek/curator:8.0.10
ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805
s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_jammy_19.2.3-1-20250805
s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805
ceph_key_placement: quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116
s3_bucket: quay.io/airshipit/ceph-daemon:ubuntu_jammy_20.2.0-1-20260116
s3_user: quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116
helm_tests: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
prometheus_elasticsearch_exporter: quay.io/prometheuscommunity/elasticsearch-exporter:v1.9.0
dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
snapshot_repository: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805
snapshot_repository: quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116
elasticsearch_templates: docker.io/linuxserver/yq:latest
image_repo_sync: quay.io/airshipit/docker:27.5.0
pull_policy: "IfNotPresent"

View File

@@ -35,7 +35,7 @@ release_group: null
images:
tags:
test: docker.io/xrally/xrally-openstack:2.0.0
glance_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial
glance_storage_init: quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy
glance_metadefs_load: quay.io/airshipit/glance:2025.1-ubuntu_noble
db_init: quay.io/airshipit/openstack-client:2025.1-ubuntu_noble
glance_db_sync: quay.io/airshipit/glance:2025.1-ubuntu_noble

View File

@@ -37,7 +37,7 @@ release_group: null
images:
tags:
dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
gnocchi_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805
gnocchi_storage_init: quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116
db_init_indexer: docker.io/library/postgres:9.5
# using non-kolla images until kolla supports postgres as
# an indexer

View File

@@ -28,7 +28,7 @@ images:
tags:
libvirt: docker.io/openstackhelm/libvirt:2025.1-ubuntu_noble
libvirt_exporter: vexxhost/libvirtd-exporter:latest
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_19.2.3-1-20250805'
ceph_config_helper: 'quay.io/airshipit/ceph-config-helper:ubuntu_jammy_20.2.0-1-20260116'
dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
image_repo_sync: quay.io/airshipit/docker:27.5.0
kubectl: docker.io/bitnami/kubectl:latest

View File

@@ -77,10 +77,10 @@ images:
nova_novncproxy: quay.io/airshipit/nova:2025.1-ubuntu_noble
nova_novncproxy_assets: 'docker.io/kolla/ubuntu-source-nova-novncproxy:wallaby'
nova_scheduler: quay.io/airshipit/nova:2025.1-ubuntu_noble
nova_storage_init: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy'
nova_storage_init: 'quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy'
# NOTE(portdirect): we simply use the ceph config helper here,
# as it has both oscli and jq.
nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy'
nova_service_cleaner: 'quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy'
nova_serialproxy: quay.io/airshipit/nova:2025.1-ubuntu_noble
nova_spiceproxy: quay.io/airshipit/nova:2025.1-ubuntu_noble
nova_spiceproxy_assets: quay.io/airshipit/nova:2025.1-ubuntu_noble

View File

@@ -24,7 +24,7 @@ images:
ovn_ovsdb_sb: docker.io/openstackhelm/ovn:ubuntu_noble
ovn_northd: docker.io/openstackhelm/ovn:ubuntu_noble
ovn_controller: docker.io/openstackhelm/ovn:ubuntu_noble
ovn_controller_kubectl: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_jammy
ovn_controller_kubectl: quay.io/airshipit/ceph-config-helper:latest-ubuntu_jammy
dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_jammy
image_repo_sync: quay.io/airshipit/docker:27.5.0
vector: docker.io/timberio/vector:0.51.1-debian

View File

@@ -0,0 +1,5 @@
---
ceph-adapter-rook:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

@@ -0,0 +1,5 @@
---
ceph-client:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

@@ -0,0 +1,5 @@
---
ceph-mon:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

@@ -0,0 +1,5 @@
---
ceph-osd:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

@@ -0,0 +1,5 @@
---
ceph-provisioners:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

@@ -0,0 +1,5 @@
---
ceph-rgw:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

@@ -0,0 +1,5 @@
---
cert-rotation:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

@@ -0,0 +1,5 @@
---
cinder:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

@@ -0,0 +1,5 @@
---
elasticsearch:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

@@ -0,0 +1,5 @@
---
glance:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

@@ -0,0 +1,5 @@
---
gnocchi:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

@@ -0,0 +1,5 @@
---
libvirt:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

@@ -0,0 +1,5 @@
---
nova:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

@@ -0,0 +1,5 @@
---
ovn:
- |
Update Ceph to Tentacle 20.2.0 and replaced image sources from docker.io/openstackhelm with quay.io/airshipit
...

View File

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

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.18.8}
CEPH_RELEASE=${CEPH_RELEASE:-19.2.3}
ROOK_RELEASE=${ROOK_RELEASE:-1.18.9}
CEPH_RELEASE=${CEPH_RELEASE:-20.2.0}
ROOK_CEPH_NAMESPACE=${ROOK_CEPH_NAMESPACE:-rook-ceph}
CEPH_NAMESPACE=${CEPH_NAMESPCE:-ceph}
ROOK_OPERATOR_YAML=${ROOK_OPERATOR_YAML:-/tmp/rook-operator.yaml}

View File

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