Allow specifying the volume label on configmaps and secrets

Allows supporting different bootstrap solutions without having explicit
support for them. For instance right now we don't have a special
kickstart volume. If we would already allow setting volume labels people
could just use configmaps and secrets right now without explicit
support.

Signed-off-by: Roman Mohr <[email protected]>

api/openapi-spec/swagger.json

@@ -4549,6 +4549,10 @@
      "optional": {
       "description": "Specify whether the ConfigMap or it's keys must be defined\n+optional",
       "type": "boolean"
+     },
+     "volumeLabel": {
+      "description": "The volume label of the resulting disk inside the VMI.\nDifferent bootstrapping mechanisms require different values.\nTypical values are \"cidata\" (cloud-init), \"config-2\" (cloud-init) or \"OEMDRV\" (kickstart).\n+optional",
+      "type": "string"
      }
     }
    },
@@ -5961,6 +5965,10 @@
      "secretName": {
       "description": "Name of the secret in the pod's namespace to use.\nMore info: https://kubernetes.io/docs/concepts/storage/volumes#secret\n+optional",
       "type": "string"
+     },
+     "volumeLabel": {
+      "description": "The volume label of the resulting disk inside the VMI.\nDifferent bootstrapping mechanisms require different values.\nTypical values are \"cidata\" (cloud-init), \"config-2\" (cloud-init) or \"OEMDRV\" (kickstart).\n+optional",
+      "type": "string"
      }
     }
    },

pkg/config/config-map.go

@@ -47,7 +47,7 @@ func CreateConfigMapDisks(vmi *v1.VirtualMachineInstance) error {
 			}
 
 			disk := GetConfigMapDiskPath(volume.Name)
-			if err := createIsoConfigImage(disk, filesPath); err != nil {
+			if err := createIsoConfigImage(disk, volume.ConfigMap.VolumeLabel, filesPath); err != nil {
 				return err
 			}
 

pkg/config/config.go

@@ -29,7 +29,7 @@ type (
 	// Type represents allowed config types like ConfigMap or Secret
 	Type string
 
-	isoCreationFunc func(output string, files []string) error
+	isoCreationFunc func(output string, volID string, files []string) error
 )
 
 const (
@@ -84,12 +84,17 @@ func getFilesLayout(dirPath string) ([]string, error) {
 	return filesPath, nil
 }
 
-func defaultCreateIsoImage(output string, files []string) error {
+func defaultCreateIsoImage(output string, volID string, files []string) error {
+
+	if volID == "" {
+		volID = "cfgdata"
+	}
+
 	var args []string
 	args = append(args, "-output")
 	args = append(args, output)
 	args = append(args, "-volid")
-	args = append(args, "cfgdata")
+	args = append(args, volID)
 	args = append(args, "-joliet")
 	args = append(args, "-rock")
 	args = append(args, "-graft-points")
@@ -103,8 +108,8 @@ func defaultCreateIsoImage(output string, files []string) error {
 	return nil
 }
 
-func createIsoConfigImage(output string, files []string) error {
-	err := createISOImage(output, files)
+func createIsoConfigImage(output string, volID string, files []string) error {
+	err := createISOImage(output, volID, files)
 	if err != nil {
 		return err
 	}

pkg/config/config_test.go

@@ -27,7 +27,7 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-func mockCreateISOImage(output string, files []string) error {
+func mockCreateISOImage(output string, volID string, files []string) error {
 	_, err := os.Create(output)
 	if err != nil {
 		panic(err)
@@ -73,7 +73,7 @@ var _ = Describe("Creating config images", func() {
 
 		It("Should create an iso image", func() {
 			imgPath := filepath.Join(tempISODir, "volume1.iso")
-			err := createIsoConfigImage(imgPath, expectedLayout)
+			err := createIsoConfigImage(imgPath, "", expectedLayout)
 			Expect(err).NotTo(HaveOccurred())
 			_, err = os.Stat(imgPath)
 			Expect(err).NotTo(HaveOccurred())

pkg/config/secret.go

@@ -48,7 +48,7 @@ func CreateSecretDisks(vmi *v1.VirtualMachineInstance) error {
 			}
 
 			disk := GetSecretDiskPath(volume.Name)
-			if err := createIsoConfigImage(disk, filesPath); err != nil {
+			if err := createIsoConfigImage(disk, volume.Secret.VolumeLabel, filesPath); err != nil {
 				return err
 			}
 

pkg/config/service-account.go

@@ -42,7 +42,7 @@ func CreateServiceAccountDisk(vmi *v1.VirtualMachineInstance) error {
 			}
 
 			disk := GetServiceAccountDiskPath()
-			if err := createIsoConfigImage(disk, filesPath); err != nil {
+			if err := createIsoConfigImage(disk, "", filesPath); err != nil {
 				return err
 			}
 

staging/src/kubevirt.io/client-go/api/v1/schema.go

@@ -66,6 +66,11 @@ type ConfigMapVolumeSource struct {
 	// Specify whether the ConfigMap or it's keys must be defined
 	// +optional
 	Optional *bool `json:"optional,omitempty"`
+	// The volume label of the resulting disk inside the VMI.
+	// Different bootstrapping mechanisms require different values.
+	// Typical values are "cidata" (cloud-init), "config-2" (cloud-init) or "OEMDRV" (kickstart).
+	// +optional
+	VolumeLabel string `json:"volumeLabel,omitempty"`
 }
 
 // SecretVolumeSource adapts a Secret into a volume.
@@ -79,6 +84,11 @@ type SecretVolumeSource struct {
 	// Specify whether the Secret or it's keys must be defined
 	// +optional
 	Optional *bool `json:"optional,omitempty"`
+	// The volume label of the resulting disk inside the VMI.
+	// Different bootstrapping mechanisms require different values.
+	// Typical values are "cidata" (cloud-init), "config-2" (cloud-init) or "OEMDRV" (kickstart).
+	// +optional
+	VolumeLabel string `json:"volumeLabel,omitempty"`
 }
 
 // ServiceAccountVolumeSource adapts a ServiceAccount into a volume.