ironic: Always add ImageFormatInitRD to supported formats

chdxD1 · chdxD1 · commit 593dca622f18 · 2022-07-22T14:47:39.000+02:00
diff --git a/pkg/provisioner/ironic/ironic.go b/pkg/provisioner/ironic/ironic.go
@@ -564,13 +564,10 @@ func (p *ironicProvisioner) PreprovisioningImageFormats() ([]metal3v1alpha1.Imag
 		return nil, err
 	}
 
-	var formats []metal3v1alpha1.ImageFormat
+	formats := []metal3v1alpha1.ImageFormat{metal3v1alpha1.ImageFormatInitRD}
 	if accessDetails.SupportsISOPreprovisioningImage() {
 		formats = append(formats, metal3v1alpha1.ImageFormatISO)
 	}
-	if p.config.deployKernelURL != "" {
-		formats = append(formats, metal3v1alpha1.ImageFormatInitRD)
-	}
 
 	return formats, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -564,13 +564,10 @@ func (p *ironicProvisioner) PreprovisioningImageFormats() ([]metal3v1alpha1.Imag`
`564`	`564`	`return nil, err`
`565`	`565`	`}`
`566`	`566`
`567`		`- var formats []metal3v1alpha1.ImageFormat`
	`567`	`+ formats := []metal3v1alpha1.ImageFormat{metal3v1alpha1.ImageFormatInitRD}`
`568`	`568`	`if accessDetails.SupportsISOPreprovisioningImage() {`
`569`	`569`	`formats = append(formats, metal3v1alpha1.ImageFormatISO)`
`570`	`570`	`}`
`571`		`- if p.config.deployKernelURL != "" {`
`572`		`- formats = append(formats, metal3v1alpha1.ImageFormatInitRD)`
`573`		`- }`
`574`	`571`
`575`	`572`	`return formats, nil`
`576`	`573`	`}`