From 3a20e5981800d9086e7f9b403e78ea5151baa78b Mon Sep 17 00:00:00 2001 From: Stephen Taylor Date: Fri, 9 Aug 2024 12:50:40 -0600 Subject: [PATCH] [ceph] Remove dependencies on legacy provisioners The legacy RBD provisioner and the CephFS provisioner haven't been used in some time. This change removes them. Change-Id: I313774627fcbaed34445ebe803adf4861a0f3db5 --- ceph-provisioners/Chart.yaml | 2 +- ceph-provisioners/values.yaml | 4 ---- ceph-provisioners/values_overrides/apparmor.yaml | 6 ------ doc/source/testing/ceph-resiliency/failure-domain.rst | 1 - releasenotes/notes/ceph-provisioners.yaml | 1 + tools/deployment/ceph/ceph_legacy.sh | 2 -- 6 files changed, 2 insertions(+), 14 deletions(-) diff --git a/ceph-provisioners/Chart.yaml b/ceph-provisioners/Chart.yaml index 9cf6a550a..47a1a4554 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.32 +version: 0.1.33 home: https://github.com/ceph/ceph ... diff --git a/ceph-provisioners/values.yaml b/ceph-provisioners/values.yaml index f7c572707..493d1ddf0 100644 --- a/ceph-provisioners/values.yaml +++ b/ceph-provisioners/values.yaml @@ -30,9 +30,7 @@ images: pull_policy: IfNotPresent tags: ceph_bootstrap: 'docker.io/openstackhelm/ceph-daemon:uubuntu_jammy_18.2.2-1-20240312' - ceph_cephfs_provisioner: 'docker.io/openstackhelm/ceph-cephfs-provisioner:ubuntu_jammy_18.2.2-1-20240312' ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312' - ceph_rbd_provisioner: 'docker.io/openstackhelm/ceph-rbd-provisioner:ubuntu_jammy_18.2.2-1-20240312' csi_provisioner: 'registry.k8s.io/sig-storage/csi-provisioner:v3.1.0' csi_snapshotter: 'registry.k8s.io/sig-storage/csi-snapshotter:v6.0.0' csi_attacher: 'registry.k8s.io/sig-storage/csi-attacher:v3.4.0' @@ -146,8 +144,6 @@ pod: readOnlyRootFilesystem: true dns_policy: "ClusterFirstWithHostNet" replicas: - cephfs_provisioner: 2 - rbd_provisioner: 2 csi_rbd_provisioner: 2 lifecycle: upgrades: diff --git a/ceph-provisioners/values_overrides/apparmor.yaml b/ceph-provisioners/values_overrides/apparmor.yaml index 0d3ed7256..4ecbe94cf 100644 --- a/ceph-provisioners/values_overrides/apparmor.yaml +++ b/ceph-provisioners/values_overrides/apparmor.yaml @@ -2,15 +2,9 @@ pod: mandatory_access_control: type: apparmor - ceph-cephfs-provisioner: - ceph-cephfs-provisioner: runtime/default - init: runtime/default ceph-cephfs-client-key-generator: ceph-storage-keys-generator: runtime/default init: runtime/default - ceph-rbd-provisioner: - ceph-rbd-provisioner: runtime/default - init: runtime/default ceph-rbd-csi-provisioner: ceph-rbd-provisioner: runtime/default init: runtime/default diff --git a/doc/source/testing/ceph-resiliency/failure-domain.rst b/doc/source/testing/ceph-resiliency/failure-domain.rst index a18287083..696786ff0 100644 --- a/doc/source/testing/ceph-resiliency/failure-domain.rst +++ b/doc/source/testing/ceph-resiliency/failure-domain.rst @@ -125,7 +125,6 @@ To list all the pods in all the namespaces, execute this **kubectl** command. NAMESPACE NAME READY STATUS RESTARTS AGE ceph ceph-bootstrap-rpzld 0/1 Completed 0 10d ceph ceph-cephfs-client-key-generator-pvzs6 0/1 Completed 0 10d - ceph ceph-cephfs-provisioner-796668cd7-bn6mn 1/1 Running 0 10d Execute Commands in Pods diff --git a/releasenotes/notes/ceph-provisioners.yaml b/releasenotes/notes/ceph-provisioners.yaml index 7e35beab8..fb17e326d 100644 --- a/releasenotes/notes/ceph-provisioners.yaml +++ b/releasenotes/notes/ceph-provisioners.yaml @@ -32,4 +32,5 @@ ceph-provisioners: - 0.1.30 Specify CSI drivername in values.yaml - 0.1.31 Use quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal by default - 0.1.32 Update ceph_rbd_provisioner image to 18.2.2 + - 0.1.33 Remove dependencies on legacy provisioners ... diff --git a/tools/deployment/ceph/ceph_legacy.sh b/tools/deployment/ceph/ceph_legacy.sh index 081a6ddd3..a979859a8 100755 --- a/tools/deployment/ceph/ceph_legacy.sh +++ b/tools/deployment/ceph/ceph_legacy.sh @@ -157,8 +157,6 @@ pod: mds: 1 mgr: 1 rgw: 1 - cephfs_provisioner: 1 - rbd_provisioner: 1 csi_rbd_provisioner: 1 jobs: