Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[release-1.29] Check for nil values when importing container definition #8158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
May 14, 2024
Merged

[release-1.29] Check for nil values when importing container definition #8158

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fb06ad
Check for nil values when importing container definition
May 8, 2024
3b99f4b
Remove surplus newline from the log message
May 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions server/container_restore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package server

import (
"encoding/json"
"errors"
"fmt"
"os"

Expand Down Expand Up @@ -56,19 +57,24 @@ func (s *Server) CRImportCheckpoint(
) (ctrID string, retErr error) {
var mountPoint string

input := createConfig.Image.Image
// Ensure that the image to restore the checkpoint from has been provided.
if createConfig.Image == nil || createConfig.Image.Image == "" {
return "", errors.New(`attribute "image" missing from container definition`)
}

inputImage := createConfig.Image.Image
createMounts := createConfig.Mounts
createAnnotations := createConfig.Annotations
createLabels := createConfig.Labels

restoreStorageImageID, err := s.checkIfCheckpointOCIImage(ctx, input)
restoreStorageImageID, err := s.checkIfCheckpointOCIImage(ctx, inputImage)
if err != nil {
return "", err
}

var restoreArchivePath string
if restoreStorageImageID != nil {
log.Debugf(ctx, "Restoring from oci image %s\n", input)
log.Debugf(ctx, "Restoring from oci image %s", inputImage)

// This is not out-of-process, but it is at least out of the CRI-O codebase; containers/storage uses raw strings.
mountPoint, err = s.ContainerServer.StorageImageServer().GetStore().MountImage(restoreStorageImageID.IDStringForOutOfProcessConsumptionOnly(), nil, "")
Expand All @@ -87,12 +93,13 @@ func (s *Server) CRImportCheckpoint(
} else {
// First get the container definition from the
// tarball to a temporary directory
archiveFile, err := os.Open(input)
archiveFile, err := os.Open(inputImage)
if err != nil {
return "", fmt.Errorf("failed to open checkpoint archive %s for import: %w", input, err)
return "", fmt.Errorf("failed to open checkpoint archive %s for import: %w", inputImage, err)
}
defer errorhandling.CloseQuiet(archiveFile)
restoreArchivePath = input
restoreArchivePath = inputImage

options := &archive.TarOptions{
// Here we only need the files config.dump and spec.dump
ExcludePatterns: []string{
Expand Down Expand Up @@ -264,11 +271,14 @@ func (s *Server) CRImportCheckpoint(
Labels: originalLabels,
}

if createConfig.Linux.Resources != nil {
containerConfig.Linux.Resources = createConfig.Linux.Resources
}
if createConfig.Linux.SecurityContext != nil {
containerConfig.Linux.SecurityContext = createConfig.Linux.SecurityContext
if createConfig.Linux != nil {
if createConfig.Linux.Resources != nil {
containerConfig.Linux.Resources = createConfig.Linux.Resources
}

if createConfig.Linux.SecurityContext != nil {
containerConfig.Linux.SecurityContext = createConfig.Linux.SecurityContext
}
}

if dumpSpec.Linux != nil {
Expand Down