Merge pull request #6312 from travisn/backport-pvc-template-name

ceph: Allow osd pvc template name set to any value (bp #6307)

pkg/operator/ceph/cluster/osd/deviceSet.go

@@ -56,12 +56,19 @@ func (c *Cluster) prepareStorageClassDeviceSets(config *provisionConfig) []rookv
 					continue
 				}
 
-				if pvcTemplate.Name == bluestorePVCData {
+				// The PVC type must be from a predefined set such as "data" and "metadata". These names must be enforced if the wal/db are specified
+				// with a separate device, but if there is a single volume template we can assume it is always the data template.
+				pvcType := pvcTemplate.Name
+				if len(storageClassDeviceSet.VolumeClaimTemplates) == 1 {
+					pvcType = bluestorePVCData
+				}
+
+				if pvcType == bluestorePVCData {
 					pvcSize := pvc.Spec.Resources.Requests[v1.ResourceStorage]
 					dataSize = pvcSize.String()
 					crushDeviceClass = pvcTemplate.Annotations["crushDeviceClass"]
 				}
-				pvcSources[pvcTemplate.Name] = v1.PersistentVolumeClaimVolumeSource{
+				pvcSources[pvcType] = v1.PersistentVolumeClaimVolumeSource{
 					ClaimName: pvc.GetName(),
 					ReadOnly:  false,
 				}

pkg/operator/ceph/cluster/osd/deviceset_test.go

@@ -16,6 +16,7 @@ limitations under the License.
 package osd
 
 import (
+	"fmt"
 	"testing"
 
 	rookv1 "github.com/rook/rook/pkg/apis/rook.io/v1"
@@ -28,6 +29,11 @@ import (
 )
 
 func TestPrepareDeviceSets(t *testing.T) {
+	testPrepareDeviceSets(t, true)
+	testPrepareDeviceSets(t, false)
+}
+
+func testPrepareDeviceSets(t *testing.T, setTemplateName bool) {
 	clientset := testexec.New(t, 1)
 	context := &clusterd.Context{
 		Clientset: clientset,
@@ -36,6 +42,9 @@ func TestPrepareDeviceSets(t *testing.T) {
 	claim := v1.PersistentVolumeClaim{Spec: v1.PersistentVolumeClaimSpec{
 		StorageClassName: &storageClass,
 	}}
+	if setTemplateName {
+		claim.Name = "randomname"
+	}
 	deviceSet := rookv1.StorageClassDeviceSet{
 		Name:                 "mydata",
 		Count:                1,
@@ -62,7 +71,11 @@ func TestPrepareDeviceSets(t *testing.T) {
 	pvcs, err := clientset.CoreV1().PersistentVolumeClaims(cluster.Namespace).List(metav1.ListOptions{})
 	assert.NoError(t, err)
 	assert.Equal(t, 1, len(pvcs.Items))
-	assert.Equal(t, "mydata-data-0-", pvcs.Items[0].GenerateName)
+	expectedName := claim.Name
+	if !setTemplateName {
+		expectedName = "data"
+	}
+	assert.Equal(t, fmt.Sprintf("mydata-%s-0-", expectedName), pvcs.Items[0].GenerateName)
 	assert.Equal(t, cluster.Namespace, pvcs.Items[0].Namespace)
 }