merge(#3645): updated PKE image Cloudinfo request params

Author: akijakya

.gen/cloudinfo/api/openapi.yaml

@@ -250,6 +250,14 @@ paths:
           type: string
         style: form
         x-go-name: Gpu
+      - explode: true
+        in: query
+        name: cr
+        required: false
+        schema:
+          type: string
+        style: form
+        x-go-name: Cr
       - explode: true
         in: query
         name: version

.gen/cloudinfo/api_images.go

@@ -222,6 +222,11 @@ paths:
           in: query
           schema:
             type: string
+        - x-go-name: Cr
+          name: cr
+          in: query
+          schema:
+            type: string
         - x-go-name: Version
           name: version
           in: query

apis/cloudinfo/openapi.yaml

@@ -436,8 +436,8 @@ func main() {
 
 		imageSelector := pkeaws.NewImageSelectorChain(commonLogger, errorHandler)
 
-		imageSelector.AddSelector("gpu", pkeaws.NewGPUImageSelector(pkeaws.GPUImages()))
 		imageSelector.AddSelector("cloudinfo", pkeawsadapter.NewCloudinfoImageSelector(cloudinfoClient))
+		imageSelector.AddSelector("gpu", pkeaws.NewGPUImageSelector(pkeaws.GPUImages()))
 		if len(config.Distribution.PKE.Amazon.DefaultImages) > 0 {
 			imageSelector.AddSelector("defaults", pkeaws.RegionMapImageSelector(config.Distribution.PKE.Amazon.DefaultImages))
 		} else {

cmd/worker/main.go

@@ -16,6 +16,8 @@ package pkeawsadapter
 
 import (
 	"context"
+	"strconv"
+	"strings"
 
 	"emperror.dev/errors"
 	"github.com/Masterminds/semver/v3"
@@ -52,11 +54,18 @@ func (s CloudinfoImageSelector) SelectImage(ctx context.Context, criteria pkeaws
 		)
 	}
 
+	isGPUInstance := func(instanceType string) bool {
+		return strings.HasPrefix(instanceType, "p2.") || strings.HasPrefix(instanceType, "p3.") ||
+			strings.HasPrefix(instanceType, "g3.") || strings.HasPrefix(instanceType, "g4.")
+	}
+
 	opts := &cloudinfo.GetImagesOpts{
 		Version:    optional.NewString(kubeVersion.String()),
 		Os:         optional.NewString(criteria.OperatingSystem),
 		PkeVersion: optional.NewString(criteria.PKEVersion),
 		LatestOnly: optional.NewString("true"),
+		Gpu:        optional.NewString(strconv.FormatBool(isGPUInstance(criteria.InstanceType))),
+		Cr:         optional.NewString(criteria.ContainerRuntime),
 	}
 
 	const (