File tree Expand file tree Collapse file tree 4 files changed +9
-3
lines changed
internal/integration/provision Expand file tree Collapse file tree 4 files changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -83,6 +83,7 @@ linters:
8383 - cloud.google.com/go
8484 - github.com/mdlayher/ethtool
8585 - github.com/insomniacslk/dhcp
86+ - github.com/containerd/containerd/v2
8687 replace-local : true
8788 exclude-forbidden : false
8889 retract-allow-no-explanation : false
Original file line number Diff line number Diff line change @@ -27,6 +27,11 @@ replace (
2727// https://github.com/insomniacslk/dhcp/pull/550
2828replace github.com/insomniacslk/dhcp => github.com/smira/dhcp v0.0.0-20250407153013-99942baa5d59
2929
30+ // deadcode elimination fix replacement: https://github.com/siderolabs/talos/issues/11296
31+ // upstream PR: https://github.com/containerd/containerd/pull/12175
32+ // this a fork with containerd 2.1 branch + the commit from the PR above
33+ replace github.com/containerd/containerd/v2 => github.com/smira/containerd/v2 v2.0.0-20250806103510-dcf2fc86e156
34+
3035// Kubernetes dependencies sharing the same version.
3136require (
3237 k8s.io/api v0.34.0-beta.0
Original file line number Diff line number Diff line change @@ -120,8 +120,6 @@ github.com/containerd/cgroups/v3 v3.0.5 h1:44na7Ud+VwyE7LIoJ8JTNQOa549a8543BmzaJ
120120github.com/containerd/cgroups/v3 v3.0.5 /go.mod h1:SA5DLYnXO8pTGYiAHXz94qvLQTKfVM5GEVisn4jpins =
121121github.com/containerd/containerd/api v1.9.0 h1:HZ/licowTRazus+wt9fM6r/9BQO7S0vD5lMcWspGIg0 =
122122github.com/containerd/containerd/api v1.9.0 /go.mod h1:GhghKFmTR3hNtyznBoQ0EMWr9ju5AqHjcZPsSpTKutI =
123- github.com/containerd/containerd/v2 v2.1.4 h1:/hXWjiSFd6ftrBOBGfAZ6T30LJcx1dBjdKEeI8xucKQ =
124- github.com/containerd/containerd/v2 v2.1.4 /go.mod h1:8C5QV9djwsYDNhxfTCFjWtTBZrqjditQ4/ghHSYjnHM =
125123github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4 =
126124github.com/containerd/continuity v0.4.5 /go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE =
127125github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI =
@@ -677,6 +675,8 @@ github.com/siderolabs/tcpproxy v0.1.0 h1:IbkS9vRhjMOscc1US3M5P1RnsGKFgB6U5IzUk+4
677675github.com/siderolabs/tcpproxy v0.1.0 /go.mod h1:onn6CPPj/w1UNqQ0U97oRPF0CqbrgEApYCw4P9IiCW8 =
678676github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ =
679677github.com/sirupsen/logrus v1.9.3 /go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ =
678+ github.com/smira/containerd/v2 v2.0.0-20250806103510-dcf2fc86e156 h1:vxHt7VLqjFtY3c80Al/RTPAxxu7XVQuTeTNkRZb2AOQ =
679+ github.com/smira/containerd/v2 v2.0.0-20250806103510-dcf2fc86e156 /go.mod h1:8C5QV9djwsYDNhxfTCFjWtTBZrqjditQ4/ghHSYjnHM =
680680github.com/smira/dhcp v0.0.0-20250407153013-99942baa5d59 h1:lBQLOP8ZZI6mbePwGX/bqXi3srwhYB/zcwqrnX+JJIc =
681681github.com/smira/dhcp v0.0.0-20250407153013-99942baa5d59 /go.mod h1:VvGYjkZoJyKqlmT1yzakUs4mfKMNB0XdODP0+rdml6k =
682682github.com/smira/kobject v0.0.0-20240304111826-49c8d4613389 h1:f/5NRv5IGZxbjBhc5MnlbNmyuXBPxvekhBAUzyKWyLY =
Original file line number Diff line number Diff line change @@ -25,7 +25,7 @@ import (
2525 "github.com/siderolabs/go-retry/retry"
2626 sideronet "github.com/siderolabs/net"
2727 "github.com/stretchr/testify/suite"
28- "gopkg.in/yaml.v2 "
28+ "gopkg.in/yaml.v3 "
2929 corev1 "k8s.io/api/core/v1"
3030 metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131 "k8s.io/apimachinery/pkg/types"
You can’t perform that action at this time.
0 commit comments