rbd: move repairImageID() from rbdVolume struct to rbdImage

The `repairImageID()` function is useful for the `rbdSnapshot` objects
as well. Move it to the `rbdImage` struct that is the base for both
`rbdVolume` and `rbdSnapshot`.

Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
Niels de Vos
2024-09-24 12:55:26 +02:00
committed by mergify[bot]
parent 9c567fd8a0
commit 2d82cebfeb
2 changed files with 10 additions and 10 deletions

View File

@ -110,6 +110,7 @@ type rbdImage struct {
// This does not have a JSON tag as it is not stashed in JSON encoded
// config maps in v1.0.0
RequestName string
ReservedID string
NamePrefix string
// ParentName represents the parent image name of the image.
ParentName string
@ -167,7 +168,6 @@ type rbdVolume struct {
AdminID string
UserID string
Mounter string
ReservedID string
MapOptions string
UnmapOptions string
LogDir string
@ -190,7 +190,6 @@ type rbdSnapshot struct {
// SourceVolumeID is the volume ID of RbdImageName, that is exchanged with CSI drivers
// RbdSnapName is the name of the RBD snapshot backing this rbdSnapshot
SourceVolumeID string
ReservedID string
RbdSnapName string
}