Update Rook to 1.12.5 and Ceph to 18.2.0

This change updates Rook to the 1.12.5 release and Ceph to the
18.2.0 (Reef) release.

Change-Id: I546780ce33b6965aa699f1578d1db9790dc4e002

ceph-client/Chart.yaml

@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Client
 name: ceph-client
-version: 0.1.47
+version: 0.1.48
 home: https://github.com/ceph/ceph-client
 ...

ceph-client/values.yaml

@@ -24,10 +24,10 @@ release_group: null
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_17.2.6-1-20230508'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_18.2.0-1-20231013'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013'
-    ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_17.2.6-1-20230508'
+    ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_18.2.0-1-20231013'
-    ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508'
+    ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013'
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
     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 quincy
+      - osd require-osd-release reef
       - status
   pool:
   # NOTE(portdirect): this drives a simple approximation of

ceph-mon/Chart.yaml

@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Mon
 name: ceph-mon
-version: 0.1.31
+version: 0.1.32
 home: https://github.com/ceph/ceph
 ...

ceph-mon/values.yaml

@@ -23,11 +23,11 @@ deployment:
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_17.2.6-1-20230508'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_18.2.0-1-20231013'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013'
-    ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_17.2.6-1-20230508'
+    ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_18.2.0-1-20231013'
-    ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_17.2.6-1-20230508'
+    ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_18.2.0-1-20231013'
-    ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508'
+    ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013'
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
     image_repo_sync: 'docker.io/library/docker:17.07.0'
   local_registry:

ceph-osd/Chart.yaml

@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph OSD
 name: ceph-osd
-version: 0.1.47
+version: 0.1.48
 home: https://github.com/ceph/ceph
 ...

ceph-osd/values.yaml

@@ -19,9 +19,9 @@
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_osd: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_17.2.6-1-20230508'
+    ceph_osd: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_18.2.0-1-20231013'
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_17.2.6-1-20230508'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_18.2.0-1-20231013'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013'
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
     image_repo_sync: 'docker.io/library/docker:17.07.0'
   local_registry:

ceph-provisioners/Chart.yaml

@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Provisioner
 name: ceph-provisioners
-version: 0.1.26
+version: 0.1.27
 home: https://github.com/ceph/ceph
 ...

ceph-provisioners/values.yaml

@@ -29,9 +29,9 @@ release_group: null
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_17.2.6-1-20230508'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_18.2.0-1-20231013'
-    ceph_cephfs_provisioner: 'docker.io/openstackhelm/ceph-cephfs-provisioner:ubuntu_focal_17.2.6-1-20230508'
+    ceph_cephfs_provisioner: 'docker.io/openstackhelm/ceph-cephfs-provisioner:ubuntu_focal_18.2.0-1-20231013'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013'
     ceph_rbd_provisioner: 'docker.io/openstackhelm/ceph-rbd-provisioner:change_770201_ubuntu_bionic-20210113'
     csi_provisioner: 'registry.k8s.io/sig-storage/csi-provisioner:v3.1.0'
     csi_snapshotter: 'registry.k8s.io/sig-storage/csi-snapshotter:v6.0.0'

ceph-rgw/Chart.yaml

@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph RadosGW
 name: ceph-rgw
-version: 0.1.29
+version: 0.1.30
 home: https://github.com/ceph/ceph
 ...

ceph-rgw/values.yaml

@@ -24,13 +24,13 @@ release_group: null
 images:
   pull_policy: IfNotPresent
   tags:
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_17.2.6-1-20230508'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_18.2.0-1-20231013'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013'
-    ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_17.2.6-1-20230508'
+    ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal_18.2.0-1-20231013'
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
     image_repo_sync: 'docker.io/library/docker:17.07.0'
-    rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508'
+    rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013'
-    rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508'
+    rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013'
     ks_endpoints: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal'
     ks_service: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal'
     ks_user: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal'

elasticsearch/Chart.yaml

@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v8.9.0
 description: OpenStack-Helm ElasticSearch
 name: elasticsearch
-version: 0.2.26
+version: 0.2.27
 home: https://www.elastic.co/
 sources:
   - https://github.com/elastic/elasticsearch

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/bobrik/curator:5.8.1
-    ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508
+    ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013
-    s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_focal_17.2.6-1-20230508
+    s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_focal_18.2.0-1-20231013
-    s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508
+    s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013
     helm_tests: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
     prometheus_elasticsearch_exporter: docker.io/justwatch/elasticsearch_exporter:1.1.0
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    snapshot_repository: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508
+    snapshot_repository: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013
     elasticsearch_templates: docker.io/openstackhelm/elasticsearch-s3:latest-8_9_0
     image_repo_sync: docker.io/library/docker:17.07.0
   pull_policy: "IfNotPresent"

gnocchi/Chart.yaml

@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v3.0.3
 description: OpenStack-Helm Gnocchi
 name: gnocchi
-version: 0.1.10
+version: 0.1.11
 home: https://gnocchi.xyz/
 icon: https://gnocchi.xyz/_static/gnocchi-logo.png
 sources:

gnocchi/values.yaml

@@ -37,7 +37,7 @@ release_group: null
 images:
   tags:
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    gnocchi_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508
+    gnocchi_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013
     db_init_indexer: docker.io/library/postgres:9.5
     # using non-kolla images until kolla supports postgres as
     # an indexer

libvirt/Chart.yaml

@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm libvirt
 name: libvirt
-version: 0.1.25
+version: 0.1.26
 home: https://libvirt.org
 sources:
   - https://libvirt.org/git/?p=libvirt.git;a=summary

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_focal_17.2.6-1-20230508'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_18.2.0-1-20231013'
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/library/docker:17.07.0
     kubectl: docker.io/bitnami/kubectl:latest

releasenotes/notes/ceph-client.yaml

@@ -48,4 +48,5 @@ ceph-client:
   - 0.1.45 Update Ceph to 17.2.6
   - 0.1.46 Strip any errors preceding pool properties JSON
   - 0.1.47 Use Helm toolkit functions for Ceph probes
+  - 0.1.48 Update Rook to 1.12.5 and Ceph to 18.2.0
 ...

releasenotes/notes/ceph-mon.yaml

@@ -32,4 +32,5 @@ ceph-mon:
   - 0.1.29 Update Ceph to 17.2.6
   - 0.1.30 Use Helm tookkit functions for Ceph probes
   - 0.1.31 Add Rook Helm charts for managing Ceph with Rook
+  - 0.1.32 Update Rook to 1.12.5 and Ceph to 18.2.0
 ...

releasenotes/notes/ceph-osd.yaml

@@ -48,4 +48,5 @@ ceph-osd:
   - 0.1.45 Extend the ceph-osd post-apply job PG wait
   - 0.1.46 Use Helm toolkit functions for Ceph probes
   - 0.1.47 Add disk zap to OSD init forced repair case
+  - 0.1.48 Update Rook to 1.12.5 and Ceph to 18.2.0
 ...

releasenotes/notes/ceph-provisioners.yaml

@@ -26,4 +26,5 @@ ceph-provisioners:
   - 0.1.24 Update all Ceph images to Focal
   - 0.1.25 Update kubernetes registry to registry.k8s.io
   - 0.1.26 Update Ceph to 17.2.6
+  - 0.1.27 Update Rook to 1.12.5 and Ceph to 18.2.0
 ...

releasenotes/notes/ceph-rgw.yaml

@@ -30,4 +30,5 @@ ceph-rgw:
   - 0.1.27 Update Ceph to 17.2.6
   - 0.1.28 Use Helm toolkit functions for Ceph probes
   - 0.1.29 Add 2023.1 Ubuntu Focal overrides
+  - 0.1.30 Update Rook to 1.12.5 and Ceph to 18.2.0
 ...

releasenotes/notes/elasticsearch.yaml

@@ -36,4 +36,5 @@ elasticsearch:
   - 0.2.24 Update Ceph to 17.2.6
   - 0.2.25 Update ElasticSearch to 8.9.0
   - 0.2.26 Add 2023.1 Ubuntu Focal overrides
+  - 0.2.27 Update Rook to 1.12.5 and Ceph to 18.2.0
 ...

releasenotes/notes/gnocchi.yaml

@@ -11,4 +11,5 @@ gnocchi:
   - 0.1.8 Migrated pdb resource to policy/v1 API version
   - 0.1.9 Migrated CronJob resource to batch/v1 API version
   - 0.1.10 Update Ceph to 17.2.6
+  - 0.1.11 Update Rook to 1.12.5 and Ceph to 18.2.0
 ...

releasenotes/notes/libvirt.yaml

@@ -26,4 +26,5 @@ libvirt:
   - 0.1.23 Add support for enabling vencrypt
   - 0.1.24 Include HOSTNAME_FQDN for certificates
   - 0.1.25 Add 2023.2 Ubuntu Jammy overrides
+  - 0.1.26 Update Rook to 1.12.5 and Ceph to 18.2.0
 ...

tools/deployment/openstack-support-rook/020-ceph.sh

@@ -15,7 +15,7 @@
 set -xe
 
 # Specify the Rook release tag to use for the Rook operator here
-ROOK_RELEASE=v1.12.4
+ROOK_RELEASE=v1.12.5
 
 # setup loopback devices for ceph
 free_loop_devices=( $(ls -1 /dev/loop[0-7] | while read loopdev; do losetup | grep -q $loopdev || echo $loopdev; done) )
@@ -352,6 +352,7 @@ enableOBCWatchOperatorNamespace: true
 admissionController:
 monitoring:
   enabled: false
+  metricsDisabled: true
 EOF
 
 helm repo add rook-release https://charts.rook.io/release
@@ -392,7 +393,7 @@ monitoring:
 pspEnable: false
 cephClusterSpec:
   cephVersion:
-    image: quay.io/ceph/ceph:v17.2.6
+    image: quay.io/ceph/ceph:v18.2.0
     allowUnsupported: false
   dataDirHostPath: /var/lib/rook
   skipUpgradeChecks: false