mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2025-12-15 22:41:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove containerd importer

Browse Source 
This is not used for quite some time now, it was used previously to
import tarballs of apid and other services images.

We are not using it anymore.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
This commit is contained in:
Andrey Smirnov 2025-02-03 17:10:11 +04:00
parent 270ffb69a3
commit c9667813d2
No known key found for this signature in database
GPG Key ID: FE042E3D4085A811
2 changed files with 0 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
internal/app/machined/pkg/system/runner/containerd/import.go
View File

@ -1,126 +0,0 @@
// This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
package containerd
import (
"context"
"fmt"
"log"
"os"
containerd "github.com/containerd/containerd/v2/client"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/pkg/namespaces"
multierror "github.com/hashicorp/go-multierror"
"github.com/siderolabs/talos/pkg/conditions"
"github.com/siderolabs/talos/pkg/machinery/constants"
)
// ImportRequest represents an image import request.
type ImportRequest struct {
Path string
Options []containerd.ImportOpt
}
// Importer implements image import.
type Importer struct {
namespace string
options importerOptions
}
type importerOptions struct {
containerdAddress string
}
// ImporterOption configures containerd Inspector.
type ImporterOption func(*importerOptions)
// WithContainerdAddress configures containerd address to use.
func WithContainerdAddress(address string) ImporterOption {
return func(o *importerOptions) {
o.containerdAddress = address
}
}
// NewImporter builds new Importer.
func NewImporter(namespace string, options ...ImporterOption) *Importer {
importer := &Importer{
namespace: namespace,
options: importerOptions{
containerdAddress: constants.CRIContainerdAddress,
},
}
for _, opt := range options {
opt(&importer.options)
}
return importer
}
// Import imports the images specified by the import requests.
func (i *Importer) Import(ctx context.Context, reqs ...*ImportRequest) (err error) {
err = conditions.WaitForFileToExist(i.options.containerdAddress).Wait(ctx)
if err != nil {
return err
}
ctx = namespaces.WithNamespace(ctx, i.namespace)
client, err := containerd.New(i.options.containerdAddress)
if err != nil {
return err
}
//nolint:errcheck
defer client.Close()
errCh := make(chan error)
var result *multierror.Error
for _, req := range reqs {
go func(errCh chan<- error, r *ImportRequest) {
errCh <- func() error {
tarball, err := os.Open(r.Path)
if err != nil {
return fmt.Errorf("error opening %s: %w", r.Path, err)
}
defer tarball.Close() //nolint:errcheck
imgs, err := client.Import(ctx, tarball, r.Options...)
if err != nil {
return fmt.Errorf("error importing %s: %w", r.Path, err)
}
if err = tarball.Close(); err != nil {
return fmt.Errorf("error closing %s: %w", r.Path, err)
}
for _, img := range imgs {
image := containerd.NewImage(client, img)
log.Printf("unpacking %s (%s)\n", img.Name, img.Target.Digest)
err = image.Unpack(ctx, defaults.DefaultSnapshotter)
if err != nil {
return fmt.Errorf("error unpacking %s: %w", img.Name, err)
}
}
return nil
}()
}(errCh, req)
}
for range reqs {
result = multierror.Append(result, <-errCh)
}
return result.ErrorOrNil()
}
// Import imports the images specified by the import requests.
func Import(ctx context.Context, namespace string, reqs ...*ImportRequest) error {
return NewImporter(namespace).Import(ctx, reqs...)
}

30
internal/pkg/containers/image/image.go
View File

@ -8,7 +8,6 @@ import (
"context"
"fmt"
stdlog "log"
"os"
"time"
containerd "github.com/containerd/containerd/v2/client"
@ -20,9 +19,7 @@ import (
"github.com/siderolabs/go-retry/retry"
"github.com/sirupsen/logrus"
containerdrunner "github.com/siderolabs/talos/internal/app/machined/pkg/system/runner/containerd"
"github.com/siderolabs/talos/pkg/machinery/config/config"
"github.com/siderolabs/talos/pkg/machinery/constants"
)
// Image pull retry settings.
@ -31,13 +28,6 @@ const (
PullRetryInterval = 5 * time.Second
)
// Image import retry settings.
const (
ImportTimeout = 5 * time.Minute
ImportRetryInterval = 5 * time.Second
ImportRetryJitter = time.Second
)
// PullOption is an option for Pull function.
type PullOption func(*PullOptions)
@ -180,23 +170,3 @@ func createAlias(ctx context.Context, client *containerd.Client, name string, de
return err
}
// Import is a convenience function that wraps containerd image import with retries.
func Import(ctx context.Context, imagePath, indexName string) error {
importer := containerdrunner.NewImporter(constants.SystemContainerdNamespace, containerdrunner.WithContainerdAddress(constants.SystemContainerdAddress))
return retry.Exponential(ImportTimeout, retry.WithUnits(ImportRetryInterval), retry.WithJitter(ImportRetryJitter), retry.WithErrorLogging(true)).Retry(func() error {
err := retry.ExpectedError(importer.Import(ctx, &containerdrunner.ImportRequest{
Path: imagePath,
Options: []containerd.ImportOpt{
containerd.WithIndexName(indexName),
},
}))
if err != nil && os.IsNotExist(err) {
return err
}
return retry.ExpectedError(err)
})
}