Merge "[ceph] Update all Ceph images to Focal"

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.41
+version: 0.1.42
 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:change_770201_ubuntu_bionic-20210113'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124'
-    ceph_mds: 'docker.io/openstackhelm/ceph-daemon:change_770201_ubuntu_bionic-20210113'
+    ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130'
-    ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113'
+    ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124'
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
     image_repo_sync: 'docker.io/library/docker:17.07.0'
   local_registry:
@@ -233,7 +233,8 @@ conf:
       unset: ""
     cluster_commands:
       # Add additional commands to run against the Ceph cluster here
-      - osd require-osd-release octopus
+      - config set global mon_allow_pool_size_one true
+      - osd require-osd-release quincy
       - status
   pool:
   # NOTE(portdirect): this drives a simple approximation of
@@ -314,7 +315,7 @@ conf:
     # the above.
     spec:
       # Health metrics pool
-      - name: device_health_metrics
+      - name: .mgr
         application: mgr_devicehealth
         replication: 1
         percent_total_data: 5

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.26
+version: 0.1.27
 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:change_770201_ubuntu_bionic-20210113'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124'
-    ceph_mon: 'docker.io/openstackhelm/ceph-daemon:change_770201_ubuntu_bionic-20210113'
+    ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130'
-    ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:change_770201_ubuntu_bionic-20210113'
+    ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130'
-    ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113'
+    ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124'
     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.42
+version: 0.1.43
 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:change_770201_ubuntu_bionic-20210113'
+    ceph_osd: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130'
-    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:change_770201_ubuntu_bionic-20210113'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124'
     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.23
+version: 0.1.24
 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:change_770201_ubuntu_bionic-20210113'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130'
     ceph_cephfs_provisioner: 'docker.io/openstackhelm/ceph-cephfs-provisioner:ubuntu_bionic-20200521'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124'
     ceph_rbd_provisioner: 'docker.io/openstackhelm/ceph-rbd-provisioner:change_770201_ubuntu_bionic-20210113'
     csi_provisioner: 'k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0'
     csi_snapshotter: 'k8s.gcr.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.24
+version: 0.1.25
 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:change_770201_ubuntu_bionic-20210113'
+    ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130'
-    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124'
-    ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:change_770201_ubuntu_bionic-20210113'
+    ceph_rgw: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130'
     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:change_770201_ubuntu_bionic-20210113'
+    rgw_s3_admin: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124'
-    rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113'
+    rgw_placement_targets: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124'
     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'

cert-rotation/Chart.yaml

@@ -16,5 +16,5 @@ appVersion: "1.0"
 description: Rotate the certificates generated by cert-manager
 home: https://cert-manager.io/
 name: cert-rotation
-version: 0.1.6
+version: 0.1.7
 ...

cert-rotation/values.yaml

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

doc/source/testing/ceph-resiliency/failure-domain.rst

@@ -695,9 +695,9 @@ An example of a lab enviroment had the following paramters set for the ceph yaml
   deployment:
     storage_secrets: true
     ceph: true
-    rbd_provisioner: true
     csi_rbd_provisioner: true
-    cephfs_provisioner: true
+    rbd_provisioner: false
+    cephfs_provisioner: false
     client_secrets: false
     rgw_keystone_user_and_endpoints: false
   bootstrap:

elasticsearch/Chart.yaml

@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v7.6.2
 description: OpenStack-Helm ElasticSearch
 name: elasticsearch
-version: 0.2.21
+version: 0.2.22
 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-7_6_2
     curator: docker.io/bobrik/curator:5.8.1
-    ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216
+    ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124
-    s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216
+    s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130
-    s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216
+    s3_user: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124
     helm_tests: docker.io/openstackhelm/elasticsearch-s3:latest-7_6_2
     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_bionic-20191216
+    snapshot_repository: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124
     elasticsearch_templates: docker.io/openstackhelm/elasticsearch-s3:latest-7_6_2
     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.5
+version: 0.1.6
 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_bionic-20191216
+    gnocchi_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124
     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.15
+version: 0.1.16
 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_bionic-20200217'
+    ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124'
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/library/docker:17.07.0
   pull_policy: "IfNotPresent"

releasenotes/notes/ceph-client.yaml

@@ -42,4 +42,5 @@ ceph-client:
   - 0.1.39 Correct check for too many OSDs in the pool job
   - 0.1.40 Fix OSD count checks in the ceph-rbd-pool job
   - 0.1.41 Allow gate scripts to use 1x replication in Ceph
+  - 0.1.42 Update all Ceph images to Focal
 ...

releasenotes/notes/ceph-mon.yaml

@@ -27,4 +27,5 @@ ceph-mon:
   - 0.1.24 Prevents mgr SA from repeated creation
   - 0.1.25 Allow for unconditional mon restart
   - 0.1.26 Added OCI registry authentication
+  - 0.1.27 Update all Ceph images to Focal
 ...

releasenotes/notes/ceph-osd.yaml

@@ -43,4 +43,5 @@ ceph-osd:
   - 0.1.40 Remove udev interactions from osd-init
   - 0.1.41 Remove ceph-mon dependency in ceph-osd liveness probe
   - 0.1.42 Added OCI registry authentication
+  - 0.1.43 Update all Ceph images to Focal
 ...

releasenotes/notes/ceph-provisioners.yaml

@@ -23,4 +23,5 @@ ceph-provisioners:
   - 0.1.21 Added OCI registry authentication
   - 0.1.22 Remove legacy Ceph provisioners
   - 0.1.23 Remove unnecessary templates
+  - 0.1.24 Update all Ceph images to Focal
 ...

releasenotes/notes/ceph-rgw.yaml

@@ -25,4 +25,5 @@ ceph-rgw:
   - 0.1.22 Update default image values
   - 0.1.23 Added OCI registry authentication
   - 0.1.24 Replace civetweb with beast for unencrypted connections
+  - 0.1.25 Update all Ceph images to Focal
 ...

releasenotes/notes/cert-rotation.yaml

@@ -7,4 +7,5 @@ cert-rotation:
   - 0.1.4 Consider initContainers when restarting resources
   - 0.1.5 Migrated CronJob resource to batch/v1 API version
   - 0.1.6 Added OCI registry authentication
+  - 0.1.7 Update all Ceph images to Focal
 ...

releasenotes/notes/elasticsearch.yaml

@@ -31,4 +31,5 @@ elasticsearch:
   - 0.2.19 Migrated CronJob resource to batch/v1 API version
   - 0.2.20 Set default python for helm test
   - 0.2.21 Added OCI registry authentication
+  - 0.2.22 Update all Ceph images to Focal
 ...

releasenotes/notes/gnocchi.yaml

@@ -6,4 +6,5 @@ gnocchi:
   - 0.1.3 Helm 3 - Fix Job labels
   - 0.1.4 Update htk requirements
   - 0.1.5 Enable taint toleration for Openstack services jobs
+  - 0.1.6 Update all Ceph images to Focal
 ...

releasenotes/notes/libvirt.yaml

@@ -16,4 +16,5 @@ libvirt:
   - 0.1.13 Added OCI registry authentication
   - 0.1.14 Remove use of exec in libvirt.sh
   - 0.1.15 Add support for libvirt to connect to external ceph without any local ceph present
+  - 0.1.16 Update all Ceph images to Focal
 ...

tools/deployment/osh-infra-logging-tls/020-ceph.sh

@@ -89,7 +89,7 @@ conf:
       crush_rule: same_host
     spec:
       # Health metrics pool
-      - name: device_health_metrics
+      - name: .mgr
         application: mgr_devicehealth
         replication: 1
         percent_total_data: 5

tools/deployment/osh-infra-logging/020-ceph.sh

@@ -90,7 +90,7 @@ conf:
       crush_rule: same_host
     spec:
       # Health metrics pool
-      - name: device_health_metrics
+      - name: .mgr
         application: mgr_devicehealth
         replication: 1
         percent_total_data: 5