Add OCI Volume Source support

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>

Author: saschagrunert

cmd/crictl/container.go

@@ -808,9 +808,20 @@ func CreateContainer(
 		}
 
 		// Try to pull the image before container creation
-		ann := config.GetImage().GetAnnotations()
-		if _, err := PullImageWithSandbox(iClient, image, auth, podConfig, ann, opts.pullOptions.timeout); err != nil {
-			return "", err
+		images := []string{image}
+
+		// Add possible OCI volume mounts
+		for _, m := range config.Mounts {
+			if m.Image != nil && m.Image.Image != "" {
+				images = append(images, m.Image.Image)
+			}
+		}
+
+		for _, image := range images {
+			logrus.Infof("Pulling image: %s", image)
+			if _, err := PullImageWithSandbox(iClient, image, auth, podConfig, config.GetImage().GetAnnotations(), opts.pullOptions.timeout); err != nil {
+				return "", err
+			}
 		}
 	}
 

go.mod

@@ -32,7 +32,7 @@ require (
 	k8s.io/api v0.31.0-alpha.3
 	k8s.io/apimachinery v0.31.0-alpha.3
 	k8s.io/client-go v0.31.0-alpha.3
-	k8s.io/cri-api v0.31.0-alpha.3
+	k8s.io/cri-api v0.31.0-alpha.3.0.20240703224615-0b09b4cd1510
 	k8s.io/cri-client v0.31.0-alpha.3
 	k8s.io/klog/v2 v2.130.1
 	k8s.io/kubectl v0.30.2

go.sum

@@ -249,8 +249,8 @@ k8s.io/client-go v0.31.0-alpha.3 h1:g9wbiICMHrFwxl3pGi63v2wPXL4Mk4z0ps6kMRHBcSI=
 k8s.io/client-go v0.31.0-alpha.3/go.mod h1:vVK9F/qT7echvzsBfdH5EeH8WH6+SMcY7IbYJCZa6fU=
 k8s.io/component-base v0.31.0-alpha.3 h1:JgTZxZ+QCkyuvbnUXQg5Lscz22t7Sj//+GjUSHD4yGo=
 k8s.io/component-base v0.31.0-alpha.3/go.mod h1:95zosfpQ0maOQqM/KBuXyvaBzsb/2u+MCgPv7dl4To8=
-k8s.io/cri-api v0.31.0-alpha.3 h1:sLth/Vdn/TpwCY3UZRIo4sme2trzl+nGYBUnQAypfzQ=
-k8s.io/cri-api v0.31.0-alpha.3/go.mod h1:++pZmPOodkvdUTNnXKrhFD68SD9WBKVP7rwC9frDbzU=
+k8s.io/cri-api v0.31.0-alpha.3.0.20240703224615-0b09b4cd1510 h1:AKDmYyMb9sepbFmMeHZvVzK/1k6Bvft9zFosCD2lBYQ=
+k8s.io/cri-api v0.31.0-alpha.3.0.20240703224615-0b09b4cd1510/go.mod h1:++pZmPOodkvdUTNnXKrhFD68SD9WBKVP7rwC9frDbzU=
 k8s.io/cri-client v0.31.0-alpha.3 h1:/2BK7UuXJWksnnea3o5L5TZePb0v212ul+HR5RxF2oY=
 k8s.io/cri-client v0.31.0-alpha.3/go.mod h1:oLipemI457hkLq+BYbN5BfiWpMGqOwnOG2yBpg5kexo=
 k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=

pkg/framework/util.go

@@ -362,9 +362,9 @@ func PullPublicImage(c internalapi.ImageManagerService, imageName string, podCon
 	imageSpec := &runtimeapi.ImageSpec{
 		Image: imageName,
 	}
-	id, err := c.PullImage(context.TODO(), imageSpec, nil, podConfig)
+	res, err := c.PullImage(context.TODO(), imageSpec, nil, podConfig)
 	ExpectNoError(err, "failed to pull image: %v", err)
-	return id
+	return res
 }
 
 // LoadYamlFile attempts to load the given YAML file into the given struct.

vendor/k8s.io/cri-api/pkg/apis/runtime/v1/api.pb.go

@@ -563,7 +563,7 @@ k8s.io/component-base/metrics/prometheusextension
 k8s.io/component-base/tracing
 k8s.io/component-base/tracing/api/v1
 k8s.io/component-base/version
-# k8s.io/cri-api v0.31.0-alpha.3
+# k8s.io/cri-api v0.31.0-alpha.3.0.20240703224615-0b09b4cd1510
 ## explicit; go 1.22.0
 k8s.io/cri-api/pkg/apis
 k8s.io/cri-api/pkg/apis/runtime/v1