mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-20 18:31:15 +00:00
3eef755b3b
This tag of hcsshim brings in a couple welcome features/improvements. One being exposing a way to query for hns endpoint statistics (Packets received/sent etc.). This tag also contains some optimizations for querying whether a certain HCN feature is supported, which is a common workflow in kube-proxy on Windows. The first result from querying HCN is now cached so further calls can skip the hcn query as well as the version range parsing that was performed. This also gets rid of some redundant logs that used to hit everytime the version range parsing occurred. The Go-winio dep bump, and all of the ctrd deps are transitive only. Nothing new is needed/intended to be used. Signed-off-by: Daniel Canter <dcanter@microsoft.com>
42 lines
1.1 KiB
Go
42 lines
1.1 KiB
Go
package computestorage
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
|
|
"github.com/Microsoft/hcsshim/internal/oc"
|
|
"github.com/pkg/errors"
|
|
"go.opencensus.io/trace"
|
|
)
|
|
|
|
// ImportLayer imports a container layer.
|
|
//
|
|
// `layerPath` is a path to a directory to import the layer to. If the directory
|
|
// does not exist it will be automatically created.
|
|
//
|
|
// `sourceFolderpath` is a pre-existing folder that contains the layer to
|
|
// import.
|
|
//
|
|
// `layerData` is the parent layer data.
|
|
func ImportLayer(ctx context.Context, layerPath, sourceFolderPath string, layerData LayerData) (err error) {
|
|
title := "hcsshim.ImportLayer"
|
|
ctx, span := trace.StartSpan(ctx, title) //nolint:ineffassign,staticcheck
|
|
defer span.End()
|
|
defer func() { oc.SetSpanStatus(span, err) }()
|
|
span.AddAttributes(
|
|
trace.StringAttribute("layerPath", layerPath),
|
|
trace.StringAttribute("sourceFolderPath", sourceFolderPath),
|
|
)
|
|
|
|
bytes, err := json.Marshal(layerData)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
err = hcsImportLayer(layerPath, sourceFolderPath, string(bytes))
|
|
if err != nil {
|
|
return errors.Wrap(err, "failed to import layer")
|
|
}
|
|
return nil
|
|
}
|