From fc929333468954d8e275076e310ba23fc4983196 Mon Sep 17 00:00:00 2001 From: Stephen Taylor Date: Wed, 22 Feb 2023 21:46:20 -0700 Subject: [PATCH] [ceph] Update all Ceph images to Focal This change updates all Ceph image references to use Focal images for all charts in openstack-helm-infra. Change-Id: I759d3bdcf1ff332413e14e367d702c3b4ec0de44 --- ceph-client/Chart.yaml | 2 +- ceph-client/values.yaml | 13 +++++++------ ceph-mon/Chart.yaml | 2 +- ceph-mon/values.yaml | 10 +++++----- ceph-osd/Chart.yaml | 2 +- ceph-osd/values.yaml | 6 +++--- ceph-provisioners/Chart.yaml | 2 +- ceph-provisioners/values.yaml | 4 ++-- ceph-rgw/Chart.yaml | 2 +- ceph-rgw/values.yaml | 10 +++++----- cert-rotation/Chart.yaml | 2 +- cert-rotation/values.yaml | 2 +- .../testing/ceph-resiliency/failure-domain.rst | 4 ++-- elasticsearch/Chart.yaml | 2 +- elasticsearch/values.yaml | 8 ++++---- gnocchi/Chart.yaml | 2 +- gnocchi/values.yaml | 2 +- libvirt/Chart.yaml | 2 +- libvirt/values.yaml | 2 +- releasenotes/notes/ceph-client.yaml | 1 + releasenotes/notes/ceph-mon.yaml | 1 + releasenotes/notes/ceph-osd.yaml | 1 + releasenotes/notes/ceph-provisioners.yaml | 1 + releasenotes/notes/ceph-rgw.yaml | 1 + releasenotes/notes/cert-rotation.yaml | 1 + releasenotes/notes/elasticsearch.yaml | 1 + releasenotes/notes/gnocchi.yaml | 1 + releasenotes/notes/libvirt.yaml | 1 + tools/deployment/osh-infra-logging-tls/020-ceph.sh | 2 +- tools/deployment/osh-infra-logging/020-ceph.sh | 2 +- 30 files changed, 51 insertions(+), 41 deletions(-) diff --git a/ceph-client/Chart.yaml b/ceph-client/Chart.yaml index 0bea61982..4a0a1e37f 100644 --- a/ceph-client/Chart.yaml +++ b/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 ... diff --git a/ceph-client/values.yaml b/ceph-client/values.yaml index cc81f03de..938fe912e 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:change_770201_ubuntu_bionic-20210113' - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113' - ceph_mds: 'docker.io/openstackhelm/ceph-daemon:change_770201_ubuntu_bionic-20210113' - ceph_rbd_pool: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124' + ceph_mds: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130' + 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 diff --git a/ceph-mon/Chart.yaml b/ceph-mon/Chart.yaml index 7d6b9c7ac..35c42837b 100644 --- a/ceph-mon/Chart.yaml +++ b/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 ... diff --git a/ceph-mon/values.yaml b/ceph-mon/values.yaml index 412d4da25..baa036683 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:change_770201_ubuntu_bionic-20210113' - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113' - ceph_mon: 'docker.io/openstackhelm/ceph-daemon:change_770201_ubuntu_bionic-20210113' - ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:change_770201_ubuntu_bionic-20210113' - ceph_mon_check: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130' + ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal-20230124' + ceph_mon: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130' + ceph_mgr: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130' + 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: diff --git a/ceph-osd/Chart.yaml b/ceph-osd/Chart.yaml index 67c969792..b76d24eb4 100644 --- a/ceph-osd/Chart.yaml +++ b/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 ... diff --git a/ceph-osd/values.yaml b/ceph-osd/values.yaml index 78b63b4c0..83622b8ea 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:change_770201_ubuntu_bionic-20210113' - ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:change_770201_ubuntu_bionic-20210113' - ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113' + ceph_osd: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130' + ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:ubuntu_focal-20230130' + 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: diff --git a/ceph-provisioners/Chart.yaml b/ceph-provisioners/Chart.yaml index cecd02fdc..575764e2c 100644 --- a/ceph-provisioners/Chart.yaml +++ b/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 ... diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml index 0fa30a9a8..409623c76 100644 --- a/ceph-provisioners/values.yaml +++ b/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' diff --git a/ceph-rgw/Chart.yaml b/ceph-rgw/Chart.yaml index 7d69d51b2..f816d11c9 100644 --- a/ceph-rgw/Chart.yaml +++ b/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 ... diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml index 982131401..ce9ef0fbe 100644 --- a/ceph-rgw/values.yaml +++ b/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_config_helper: 'docker.io/openstackhelm/ceph-config-helper:change_770201_ubuntu_bionic-20210113' - ceph_rgw: '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:ubuntu_focal-20230124' + 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_placement_targets: '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: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' diff --git a/cert-rotation/Chart.yaml b/cert-rotation/Chart.yaml index 3925bbb9a..919c22818 100644 --- a/cert-rotation/Chart.yaml +++ b/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 ... diff --git a/cert-rotation/values.yaml b/cert-rotation/values.yaml index 6b3d2b82f..5b35f2bd8 100644 --- a/cert-rotation/values.yaml +++ b/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 diff --git a/doc/source/testing/ceph-resiliency/failure-domain.rst b/doc/source/testing/ceph-resiliency/failure-domain.rst index a49060c03..a18287083 100644 --- a/doc/source/testing/ceph-resiliency/failure-domain.rst +++ b/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: diff --git a/elasticsearch/Chart.yaml b/elasticsearch/Chart.yaml index 5296914a9..d8692ab6a 100644 --- a/elasticsearch/Chart.yaml +++ b/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 diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 5a9c5de2a..0e8136acc 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-7_6_2 curator: docker.io/bobrik/curator:5.8.1 - ceph_key_placement: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216 - s3_bucket: docker.io/openstackhelm/ceph-daemon:ubuntu_bionic-20191216 - s3_user: 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_focal-20230130 + 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" diff --git a/gnocchi/Chart.yaml b/gnocchi/Chart.yaml index f9909e2c3..38cff59be 100644 --- a/gnocchi/Chart.yaml +++ b/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: diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml index 74cf0163a..8ee3775ce 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: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 diff --git a/libvirt/Chart.yaml b/libvirt/Chart.yaml index 1381a8d9b..10392aad4 100644 --- a/libvirt/Chart.yaml +++ b/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 diff --git a/libvirt/values.yaml b/libvirt/values.yaml index 1264fd614..034bd5fa9 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_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" diff --git a/releasenotes/notes/ceph-client.yaml b/releasenotes/notes/ceph-client.yaml index e7bfcea1d..f93c343e0 100644 --- a/releasenotes/notes/ceph-client.yaml +++ b/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 ... diff --git a/releasenotes/notes/ceph-mon.yaml b/releasenotes/notes/ceph-mon.yaml index 124d5c7c1..d7c3047d2 100644 --- a/releasenotes/notes/ceph-mon.yaml +++ b/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 ... diff --git a/releasenotes/notes/ceph-osd.yaml b/releasenotes/notes/ceph-osd.yaml index 040531f48..23c29f328 100644 --- a/releasenotes/notes/ceph-osd.yaml +++ b/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 ... diff --git a/releasenotes/notes/ceph-provisioners.yaml b/releasenotes/notes/ceph-provisioners.yaml index 070e37460..dc05b839a 100644 --- a/releasenotes/notes/ceph-provisioners.yaml +++ b/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 ... diff --git a/releasenotes/notes/ceph-rgw.yaml b/releasenotes/notes/ceph-rgw.yaml index 938c893c6..3c6c307c7 100644 --- a/releasenotes/notes/ceph-rgw.yaml +++ b/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 ... diff --git a/releasenotes/notes/cert-rotation.yaml b/releasenotes/notes/cert-rotation.yaml index 8ada06b25..d7014daca 100644 --- a/releasenotes/notes/cert-rotation.yaml +++ b/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 ... diff --git a/releasenotes/notes/elasticsearch.yaml b/releasenotes/notes/elasticsearch.yaml index 1c6aa4ee5..10c51ce16 100644 --- a/releasenotes/notes/elasticsearch.yaml +++ b/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 ... diff --git a/releasenotes/notes/gnocchi.yaml b/releasenotes/notes/gnocchi.yaml index 1d2afd02e..320cff21b 100644 --- a/releasenotes/notes/gnocchi.yaml +++ b/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 ... diff --git a/releasenotes/notes/libvirt.yaml b/releasenotes/notes/libvirt.yaml index c4932a830..1b5bfc052 100644 --- a/releasenotes/notes/libvirt.yaml +++ b/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 ... diff --git a/tools/deployment/osh-infra-logging-tls/020-ceph.sh b/tools/deployment/osh-infra-logging-tls/020-ceph.sh index 5c7020885..d91257081 100755 --- a/tools/deployment/osh-infra-logging-tls/020-ceph.sh +++ b/tools/deployment/osh-infra-logging-tls/020-ceph.sh @@ -87,7 +87,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 diff --git a/tools/deployment/osh-infra-logging/020-ceph.sh b/tools/deployment/osh-infra-logging/020-ceph.sh index 00daec5e3..842dc7807 100755 --- a/tools/deployment/osh-infra-logging/020-ceph.sh +++ b/tools/deployment/osh-infra-logging/020-ceph.sh @@ -88,7 +88,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