github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #10747 from lujinda/anno-image-user-specified

Browse Source 
[cri] use 'UserSpecifiedImage' to set the image-name annotation
This commit is contained in:
Fu Wei 2024-09-30 04:47:30 +00:00 committed by GitHub
commit 363e50bee0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/cri/server/container_create.go
View File

@ -183,6 +183,10 @@ func (c *criService) CreateContainer(ctx context.Context, r *runtime.CreateConta
} }
log.G(ctx).Debugf("Use OCI runtime %+v for sandbox %q and container %q", ociRuntime, sandboxID, id) log.G(ctx).Debugf("Use OCI runtime %+v for sandbox %q and container %q", ociRuntime, sandboxID, id)
imageName := containerdImage.Name()
if name := config.GetImage().GetUserSpecifiedImage(); name != "" {
imageName = name
}
spec, err := c.buildContainerSpec( spec, err := c.buildContainerSpec(
platform, platform,
id, id,
@ -190,7 +194,7 @@ func (c *criService) CreateContainer(ctx context.Context, r *runtime.CreateConta
sandboxPid, sandboxPid,
sandbox.NetNSPath, sandbox.NetNSPath,
containerName, containerName,
containerdImage.Name(), imageName,
config, config,
sandboxConfig, sandboxConfig,
&image.ImageSpec.Config, &image.ImageSpec.Config,