Set ImageContent.Download as required

Fixes: #261
k-orc · Feb 25, 2025 · fc29baf · fc29baf
1 parent bb636ca
commit fc29baf
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 15 deletions.
diff --git a/api/v1alpha1/image_types.go b/api/v1alpha1/image_types.go
@@ -229,8 +229,8 @@ type ImageContent struct {
 
 	// download describes how to obtain image data by downloading it from a URL.
 	// Must be set when creating a managed image.
-	// +optional
-	Download *ImageContentSourceDownload `json:"download,omitempty"`
+	// +required
+	Download *ImageContentSourceDownload `json:"download"`
 }
 
 type ImageContentSourceDownload struct {

diff --git a/cmd/models-schema/zz_generated.openapi.go b/cmd/models-schema/zz_generated.openapi.go
diff --git a/config/crd/bases/openstack.k-orc.cloud_images.yaml b/config/crd/bases/openstack.k-orc.cloud_images.yaml
@@ -238,6 +238,7 @@ spec:
                         type: object
                     required:
                     - diskFormat
+                    - download
                     type: object
                     x-kubernetes-validations:
                     - message: content is immutable

diff --git a/internal/controllers/image/upload.go b/internal/controllers/image/upload.go
@@ -83,11 +83,6 @@ func (r *orcImageReconciler) uploadImageContent(ctx context.Context, orcImage *o
 	}
 
 	download := content.Download
-	if download == nil {
-		// Should have been caught by validation
-		return orcerrors.Terminal(orcv1alpha1.ConditionReasonInvalidConfiguration, "image source type URL has no url entry")
-	}
-
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, download.URL, http.NoBody)
 	if err != nil {
 		return fmt.Errorf("error creating request for %s: %w", download.URL, err)

diff --git a/internal/controllers/image/upload_test.go b/internal/controllers/image/upload_test.go
@@ -191,7 +191,7 @@ var _ = Describe("Upload tests", Ordered, func() {
 				Content: &orcv1alpha1.ImageContent{
 					ContainerFormat: orcv1alpha1.ImageContainerFormatBare,
 					DiskFormat:      orcv1alpha1.ImageDiskFormatRaw,
-					Download: &orcv1alpha1.ImageContentSourceDownload{
+					Download: orcv1alpha1.ImageContentSourceDownload{
 						URL:        "http://" + fileServeAddr + "/" + imageName,
 						Decompress: opts.compression,
 						Hash:       opts.downloadHash,

diff --git a/internal/controllers/image/webdownload.go b/internal/controllers/image/webdownload.go
@@ -63,11 +63,6 @@ func (r *orcImageReconciler) canWebDownload(ctx context.Context, orcImage *orcv1
 	}
 
 	download := content.Download
-	if download == nil {
-		debugLog("not type URL")
-		return false, nil
-	}
-
 	// web-download does not deterministically support decompression.
 	// Glance can be configured to do automatic decompression of imported
 	// images, but there's no way to determine if it is enabled so it can't

diff --git a/test/apivalidations/image_test.go b/test/apivalidations/image_test.go
@@ -118,7 +118,7 @@ var _ = Describe("ORC Image API validations", func() {
 		image.Spec.Resource = &orcv1alpha1.ImageResourceSpec{
 			Content: &orcv1alpha1.ImageContent{
 				DiskFormat: orcv1alpha1.ImageDiskFormatQCOW2,
-				Download: &orcv1alpha1.ImageContentSourceDownload{
+				Download: orcv1alpha1.ImageContentSourceDownload{
 					URL: "https://example.com/example.img",
 				},
 			},