Merge pull request #2109 from mhanss/fix-rdh

OCPBUGS-62445: prevent crash when rootDeviceHints format is invalid

Author: openshift-merge-bot[bot]

pkg/cli/admin/nodeimage/create.go

@@ -635,6 +635,9 @@ func (o *CreateOptions) createConfigFileFromFlags() ([]byte, error) {
 	}
 	if o.SingleNodeOpts.RootDeviceHints != "" {
 		parts := strings.SplitN(o.SingleNodeOpts.RootDeviceHints, ":", 2)
+		if len(parts) != 2 {
+			return nil, fmt.Errorf("incorrect rootDeviceHints format provided: %s. Expected format: <hint name>:<value>, for example: deviceName:/dev/sda", o.SingleNodeOpts.RootDeviceHints)
+		}
 		host["rootDeviceHints"] = map[string]interface{}{
 			parts[0]: parts[1],
 		}

pkg/cli/admin/nodeimage/create_test.go

@@ -664,6 +664,13 @@ func TestCreateConfigFileFromFlags(t *testing.T) {
 			},
 			expectedConfigFile: expectedConfigFile,
 		},
+		{
+			name: "root device hints incorrect",
+			singleNodeCreateOptions: &singleNodeCreateOptions{
+				RootDeviceHints: "/dev/sda",
+			},
+			expectedError: "incorrect rootDeviceHints format provided: /dev/sda. Expected format: <hint name>:<value>, for example: deviceName:/dev/sda",
+		},
 		{
 			name: "ssh-key-path missing or incorrect",
 			singleNodeCreateOptions: &singleNodeCreateOptions{