Fix Image Filtering (#245)

spjmurray · spjmurray · commit f3a50f3b8908 · 2025-05-15T17:10:17.000+01:00
No idea why this got deleted in the first place!
diff --git a/pkg/server/handler/cluster/conversion.go b/pkg/server/handler/cluster/conversion.go
@@ -283,6 +283,15 @@ func (g *generator) defaultImage(ctx context.Context, request *openapi.Kubernete
 		return nil, errors.OAuth2ServerError("failed to list images").WithError(err)
 	}
 
+	// Only get the version asked for.
+	images = slices.DeleteFunc(images, func(x regionapi.Image) bool {
+		return (*x.Spec.SoftwareVersions)["kubernetes"] != request.Spec.Version
+	})
+
+	if len(images) == 0 {
+		return nil, errors.OAuth2ServerError("unable to select an image")
+	}
+
 	return &images[0], nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -283,6 +283,15 @@ func (g generator) defaultImage(ctx context.Context, request openapi.Kubernete`
`283`	`283`	`return nil, errors.OAuth2ServerError("failed to list images").WithError(err)`
`284`	`284`	`}`
`285`	`285`
	`286`	`+ // Only get the version asked for.`
	`287`	`+ images = slices.DeleteFunc(images, func(x regionapi.Image) bool {`
	`288`	`+ return (*x.Spec.SoftwareVersions)["kubernetes"] != request.Spec.Version`
	`289`	`+ })`
	`290`	`+`
	`291`	`+ if len(images) == 0 {`
	`292`	`+ return nil, errors.OAuth2ServerError("unable to select an image")`
	`293`	`+ }`
	`294`	`+`
`286`	`295`	`return &images[0], nil`
`287`	`296`	`}`
`288`	`297`