Skip to content
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

Remvove usage of deprecated containerd docker package #4622

Merged
merged 1 commit into from
Jun 13, 2024
Merged

Remvove usage of deprecated containerd docker package #4622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ require (
github.com/cloudflare/cfssl v1.6.4
github.com/containerd/cgroups/v3 v3.0.3
github.com/containerd/containerd v1.7.18
github.com/distribution/reference v0.5.0
github.com/evanphx/json-patch v5.7.0+incompatible
github.com/fsnotify/fsnotify v1.7.0
github.com/go-logr/logr v1.4.2
Expand Down Expand Up @@ -118,7 +119,6 @@ require (
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/daviddengcn/go-colortext v1.0.0 // indirect
github.com/distribution/reference v0.5.0 // indirect
github.com/docker/cli v25.0.1+incompatible // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker v25.0.5+incompatible // indirect
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/k0s/v1beta1/images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/util/validation/field"

"github.com/containerd/containerd/reference/docker"
"github.com/distribution/reference"
)

// ImageSpec container image settings
Expand All @@ -48,7 +48,7 @@ func (s *ImageSpec) Validate(path *field.Path) (errs field.ErrorList) {
errs = append(errs, field.Invalid(path.Child("image"), s.Image, "must not have leading or trailing whitespace"))
}

versionRe := regexp.MustCompile(`^` + docker.TagRegexp.String() + `$`)
versionRe := regexp.MustCompile(`^` + reference.TagRegexp.String() + `$`)
if !versionRe.MatchString(s.Version) {
errs = append(errs, field.Invalid(path.Child("version"), s.Version, "must match regular expression: "+versionRe.String()))
}
Expand Down
Loading