Mirror/k3s
1
0
Fork 0
mirror of https://github.com/k3s-io/k3s.git synced 2024-06-07 19:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Change containerd image leases from 24h to permanent (#3452)" (#3461)

Browse Source 
This reverts commit 86b3ba8dba.
This commit is contained in:
Derek Nola 2021-06-15 14:56:14 -07:00 committed by GitHub
parent 86b3ba8dba
commit b74c499709
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/agent/containerd/containerd.go
View File

@ -17,7 +17,6 @@ import (
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/leases"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/reference/docker" "github.com/containerd/containerd/reference/docker"
"github.com/klauspost/compress/zstd" "github.com/klauspost/compress/zstd"
@ -176,24 +175,11 @@ func preloadImages(ctx context.Context, cfg *config.Node) error {
// Ensure that nothing else can modify the image store while we're importing, // Ensure that nothing else can modify the image store while we're importing,
// and that our images are imported into the k8s.io namespace // and that our images are imported into the k8s.io namespace
ctx = namespaces.WithNamespace(ctx, "k8s.io") ctx, done, err := client.WithLease(namespaces.WithNamespace(ctx, "k8s.io"))
// At startup all images in the store with a lease are cleared
ls := client.LeasesService()
existingLeases, err := ls.List(ctx)
if err != nil {
return err
}
for _, lease := range existingLeases {
logrus.Debugf("Deleting existing lease: %v", lease)
ls.Delete(ctx, lease)
}
// Any images found on import are given a lease that never expires
_, err = ls.Create(ctx, leases.WithRandomID())
if err != nil { if err != nil {
return err return err
} }
defer done(ctx)
for _, fileInfo := range fileInfos { for _, fileInfo := range fileInfos {
if fileInfo.IsDir() { if fileInfo.IsDir() {