From df64d3f88260655282341694874b1b96a31aa502 Mon Sep 17 00:00:00 2001
From: Zeqian Meng <1109697+ZeqianMeng@users.noreply.github.com>
Date: Wed, 20 Aug 2025 11:37:23 +0200
Subject: [PATCH] Remove rbd image and storage class

The rbd in-tree storage driver and related support have been
dropped entirely since v1.31 release. And the image is not
being used in e2e tests.
---
 .../testing-manifests/rbd-storage-class.yaml  |  14 ----
 test/images/volume/rbd/BASEIMAGE              |   4 -
 test/images/volume/rbd/Dockerfile             |  37 ---------
 test/images/volume/rbd/README.md              |   9 ---
 test/images/volume/rbd/VERSION                |   1 -
 test/images/volume/rbd/block.tar.gz           | Bin 128753 -> 0 bytes
 test/images/volume/rbd/bootstrap.sh           |  76 ------------------
 test/images/volume/rbd/ceph.conf.sh           |  42 ----------
 test/images/volume/rbd/create_block.sh        |  50 ------------
 test/images/volume/rbd/keyring                |   8 --
 test/images/volume/rbd/mds.sh                 |  20 -----
 test/images/volume/rbd/mon.sh                 |  36 ---------
 test/images/volume/rbd/osd.sh                 |  25 ------
 13 files changed, 322 deletions(-)
 delete mode 100644 test/e2e/testing-manifests/rbd-storage-class.yaml
 delete mode 100644 test/images/volume/rbd/BASEIMAGE
 delete mode 100644 test/images/volume/rbd/Dockerfile
 delete mode 100644 test/images/volume/rbd/README.md
 delete mode 100644 test/images/volume/rbd/VERSION
 delete mode 100644 test/images/volume/rbd/block.tar.gz
 delete mode 100755 test/images/volume/rbd/bootstrap.sh
 delete mode 100755 test/images/volume/rbd/ceph.conf.sh
 delete mode 100755 test/images/volume/rbd/create_block.sh
 delete mode 100644 test/images/volume/rbd/keyring
 delete mode 100755 test/images/volume/rbd/mds.sh
 delete mode 100755 test/images/volume/rbd/mon.sh
 delete mode 100755 test/images/volume/rbd/osd.sh

diff --git a/test/e2e/testing-manifests/rbd-storage-class.yaml b/test/e2e/testing-manifests/rbd-storage-class.yaml
deleted file mode 100644
index e2d7d67d98c..00000000000
--- a/test/e2e/testing-manifests/rbd-storage-class.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-   name: slow
-provisioner: kubernetes.io/rbd
-parameters:
-    monitors: 127.0.0.1:6789
-    adminId: admin
-    adminSecretName: ceph-secret-admin
-    adminSecretNamespace: "kube-system"
-    pool: kube
-    userId: kube
-    userSecretName: ceph-secret-user
-
diff --git a/test/images/volume/rbd/BASEIMAGE b/test/images/volume/rbd/BASEIMAGE
deleted file mode 100644
index 7f6cb4ec098..00000000000
--- a/test/images/volume/rbd/BASEIMAGE
+++ /dev/null
@@ -1,4 +0,0 @@
-linux/amd64=fedora:38
-linux/arm64=arm64v8/fedora:38
-linux/ppc64le=ppc64le/fedora:38
-linux/s390x=s390x/fedora:38
diff --git a/test/images/volume/rbd/Dockerfile b/test/images/volume/rbd/Dockerfile
deleted file mode 100644
index fd82a4126a5..00000000000
--- a/test/images/volume/rbd/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2016 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# CEPH all in one
-# Based on image by Ricardo Rocha, ricardo@catalyst.net.nz
-
-ARG BASEIMAGE
-FROM $BASEIMAGE
-
-CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
-
-# Base Packages
-RUN yum install -y wget strace psmisc procps-ng ceph ceph-fuse hostname && yum clean all
-
-# Get ports exposed
-EXPOSE 6789
-
-ADD ./bootstrap.sh /bootstrap.sh
-ADD ./mon.sh /mon.sh
-ADD ./mds.sh /mds.sh
-ADD ./osd.sh /osd.sh
-ADD ./ceph.conf.sh /ceph.conf.sh
-ADD ./keyring /var/lib/ceph/mon/keyring
-ADD ./block.tar.gz /
-
-CMD /bootstrap.sh
diff --git a/test/images/volume/rbd/README.md b/test/images/volume/rbd/README.md
deleted file mode 100644
index 1630be89df8..00000000000
--- a/test/images/volume/rbd/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# rbd and ceph target container for testing.
-
-* The container needs to run with `docker --privileged` mode
-
-`block.tar.gz` is a small ext2 filesystem created by `create_block.sh` (run as root!)
-
-# Credentials
-
-Credentials in this directory are generated for testing purposes only.
diff --git a/test/images/volume/rbd/VERSION b/test/images/volume/rbd/VERSION
deleted file mode 100644
index af0b7ddbffd..00000000000
--- a/test/images/volume/rbd/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.0.6
diff --git a/test/images/volume/rbd/block.tar.gz b/test/images/volume/rbd/block.tar.gz
deleted file mode 100644
index 8ec08a1d96204c7a7b1a8b517b3eb8bbcb2dc003..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 128753
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

diff --git a/test/images/volume/rbd/bootstrap.sh b/test/images/volume/rbd/bootstrap.sh
deleted file mode 100755
index 3414bfa949b..00000000000
--- a/test/images/volume/rbd/bootstrap.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Bootstraps a CEPH server.
-# It creates two OSDs on local machine, creates RBD pool there
-# and imports 'block' device there.
-#
-# We must create fresh OSDs and filesystem here, because shipping it
-# in a container would increase the image by ~300MB.
-#
-
-
-# Create /etc/ceph/ceph.conf
-sh ./ceph.conf.sh "$(hostname -i)"
-
-# Configure and start ceph-mon
-sh ./mon.sh "$(hostname -i)"
-
-# Configure and start 2x ceph-osd
-mkdir -p /var/lib/ceph/osd/ceph-0 /var/lib/ceph/osd/ceph-1
-sh ./osd.sh 0
-sh ./osd.sh 1
-
-# Configure and start cephfs metadata server
-sh ./mds.sh
-
-# Prepare a RBD volume "foo" (only with layering feature, the others may
-# require newer clients).
-# NOTE: we need Ceph kernel modules on the host that runs the client!
-# As the default pool `rbd` might not be created on arm64 platform for ceph deployment,
-# should create it if it does not exist.
-arch=$(uname -m)
-if [[ ${arch} = 'aarch64' || ${arch} = 'arm64' ]]; then
-    if [[ $(ceph osd lspools) = "" ]]; then
-        ceph osd pool create rbd 8
-        rbd pool init rbd
-    fi
-fi
-rbd import --image-feature layering block foo
-
-# Prepare a cephfs volume
-ceph osd pool create cephfs_data 4
-ceph osd pool create cephfs_metadata 4
-ceph fs new cephfs cephfs_metadata cephfs_data
-# Put index.html into the volume
-# It takes a while until the volume created above is mountable,
-# 1 second is usually enough, but try indefinetily.
-sleep 1
-while ! ceph-fuse -m "$(hostname -i):6789" /mnt; do
-    echo "Waiting for cephfs to be up"
-    sleep 1
-done
-echo "Hello Ceph!" > /mnt/index.html
-chmod 644 /mnt/index.html
-umount /mnt
-
-echo "Ceph is ready"
-
-# Wait forever
-while true; do
-    sleep 10
-done
diff --git a/test/images/volume/rbd/ceph.conf.sh b/test/images/volume/rbd/ceph.conf.sh
deleted file mode 100755
index 6db6658d128..00000000000
--- a/test/images/volume/rbd/ceph.conf.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Configures /etc/ceph.conf from a template.
-#
-
-echo "
-[global]
-auth cluster required = none
-auth service required = none
-auth client required = none
-
-[mon.a]
-host = cephbox
-mon addr = $1
-
-[osd]
-osd journal size = 128
-journal dio = false
-
-# allow running on ext4
-osd max object name len = 256
-osd max object namespace len = 64
-
-[osd.0]
-osd host = cephbox
-" > /etc/ceph/ceph.conf
-
diff --git a/test/images/volume/rbd/create_block.sh b/test/images/volume/rbd/create_block.sh
deleted file mode 100755
index 258639e0eb7..00000000000
--- a/test/images/volume/rbd/create_block.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Create block.tar.gz with a small ext2 filesystem.
-# It must be run as root (to mount with '-o loop')!
-
-# Exit on the first error.
-set -e
-
-MNTDIR="$(mktemp -d)"
-
-cleanup()
-{
-    # Make sure we return the right exit code
-    RET=$?
-    # Silently remove everything and ignore errors
-    set +e
-    /bin/umount "$MNTDIR" 2>/dev/null
-    /bin/rmdir "$MNTDIR" 2>/dev/null
-    /bin/rm block 2>/dev/null
-    exit $RET
-}
-
-trap cleanup TERM EXIT
-
-# Create 120MB device with ext2
-# (volume_io tests need at least 100MB)
-dd if=/dev/zero of=block seek=120 count=1 bs=1M
-mkfs.ext2 block
-
-# Add index.html to it
-mount -o loop block "$MNTDIR"
-echo "Hello from RBD" > "$MNTDIR/index.html"
-umount "$MNTDIR"
-
-rm block.tar.gz 2>/dev/null || :
-tar cfz block.tar.gz block
diff --git a/test/images/volume/rbd/keyring b/test/images/volume/rbd/keyring
deleted file mode 100644
index f8c5af22417..00000000000
--- a/test/images/volume/rbd/keyring
+++ /dev/null
@@ -1,8 +0,0 @@
-[mon.]
-        key = AQDRrKNV6z4UChAABzP1ZyysTU4pjgjNOf/p3A==
-[client.admin]
-        key = AQDRrKNVbEevChAAEmRC+pW/KBVHxa0w/POILA==
-        auid = 0
-        caps mds = "allow *"
-        caps mon = "allow *"
-        caps osd = "allow *"
diff --git a/test/images/volume/rbd/mds.sh b/test/images/volume/rbd/mds.sh
deleted file mode 100755
index a5c89677446..00000000000
--- a/test/images/volume/rbd/mds.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2017 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Configures Ceph Metadata Service (mds), needed by CephFS
-#
-ceph-mds -i cephfs -c /etc/ceph/ceph.conf
diff --git a/test/images/volume/rbd/mon.sh b/test/images/volume/rbd/mon.sh
deleted file mode 100755
index 21c4ee64383..00000000000
--- a/test/images/volume/rbd/mon.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Configures and launches a new MON.
-#
-
-# monitor setup
-monmaptool --create --clobber --fsid "$(uuidgen)" --add a "${1}":6789 /etc/ceph/monmap
-mkdir /var/lib/ceph/mon/ceph-a
-ceph-mon -i a --mkfs --monmap /etc/ceph/monmap -k /var/lib/ceph/mon/keyring
-cp /var/lib/ceph/mon/keyring /var/lib/ceph/mon/ceph-a
-ceph-mon -i a --monmap /etc/ceph/monmap -k /var/lib/ceph/mon/ceph-a/keyring
-
-# client setup (handy)
-cp /var/lib/ceph/mon/keyring /etc/ceph
-
-# for this test we want to
-ceph osd getcrushmap -o /tmp/crushc
-crushtool -d /tmp/crushc -o /tmp/crushd
-sed -i 's/step chooseleaf firstn 0 type host/step chooseleaf firstn 0 type osd/' /tmp/crushd
-crushtool -c /tmp/crushd -o /tmp/crushc
-ceph osd setcrushmap -i /tmp/crushc
diff --git a/test/images/volume/rbd/osd.sh b/test/images/volume/rbd/osd.sh
deleted file mode 100755
index f86d3d17319..00000000000
--- a/test/images/volume/rbd/osd.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2015 The Kubernetes Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#
-# Configures and launches a new OSD.
-#
-
-ceph osd create
-ceph-osd -i "${1}" --mkfs --mkkey
-ceph auth add "osd.${1}" osd 'allow *' mon 'allow rwx' -i "/var/lib/ceph/osd/ceph-${1}/keyring"
-ceph osd crush add "${1}" 1 root=default host=cephbox
-ceph-osd -i "${1}" -k "/var/lib/ceph/osd/ceph-${1}/keyring"