mirrors/talos
1
0
Fork 0
mirror of https://github.com/siderolabs/talos.git synced 2026-04-14 10:11:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: stop using containerd package for cri namespace

Browse Source 
In containerd 2.0 source tree, this constant is under `internal`, so we
can't import it directly.

So instead re-declare it as a Talos constant.

Doing this multi-staged, as `go-talos-support` is using it as well, and
to update it to stop importing old containerd library I need first to
declare the constant in Talos source tree.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
This commit is contained in:
Andrey Smirnov 2024-05-21 17:45:52 +04:00
parent d4307043ff
commit e1711cd3c9
No known key found for this signature in database
GPG Key ID: FE042E3D4085A811
9 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/talosctl/cmd/talos/containers.go
View File

@ -12,7 +12,6 @@ import (
"strings"
"text/tabwriter"
criconstants "github.com/containerd/containerd/pkg/cri/constants"
"github.com/spf13/cobra"
"google.golang.org/grpc"
"google.golang.org/grpc/peer"
@ -39,7 +38,7 @@ var containersCmd = &cobra.Command{
)
if kubernetesFlag {
namespace = criconstants.K8sContainerdNamespace
namespace = constants.K8sContainerdNamespace
driver = common.ContainerDriver_CRI
} else {
namespace = constants.SystemContainerdNamespace

3
cmd/talosctl/cmd/talos/logs.go
View File

@ -12,7 +12,6 @@ import (
"os"
"sync"
criconstants "github.com/containerd/containerd/pkg/cri/constants"
"github.com/siderolabs/gen/xslices"
"github.com/spf13/cobra"
"google.golang.org/grpc"
@ -55,7 +54,7 @@ var logsCmd = &cobra.Command{
)
if kubernetesFlag {
namespace = criconstants.K8sContainerdNamespace
namespace = constants.K8sContainerdNamespace
driver = common.ContainerDriver_CRI
} else {
namespace = constants.SystemContainerdNamespace

4
cmd/talosctl/cmd/talos/netstat.go
View File

@ -13,13 +13,13 @@ import (
"strings"
"text/tabwriter"
criconstants "github.com/containerd/containerd/pkg/cri/constants"
"github.com/spf13/cobra"
"github.com/siderolabs/talos/pkg/cli"
"github.com/siderolabs/talos/pkg/machinery/api/common"
"github.com/siderolabs/talos/pkg/machinery/api/machine"
"github.com/siderolabs/talos/pkg/machinery/client"
"github.com/siderolabs/talos/pkg/machinery/constants"
)
var netstatCmdFlags struct {
@ -207,7 +207,7 @@ func netstatFlagsToRequest() *machine.NetstatRequest {
}
func (n *netstat) getPodNetNsFromNode(ctx context.Context) (err error) {
resp, err := n.client.Containers(ctx, criconstants.K8sContainerdNamespace, common.ContainerDriver_CRI)
resp, err := n.client.Containers(ctx, constants.K8sContainerdNamespace, common.ContainerDriver_CRI)
if err != nil {
cli.Warning("error getting containers: %v", err)

3
cmd/talosctl/cmd/talos/restart.go
View File

@ -8,7 +8,6 @@ import (
"context"
"fmt"
criconstants "github.com/containerd/containerd/pkg/cri/constants"
"github.com/spf13/cobra"
"github.com/siderolabs/talos/pkg/machinery/api/common"
@ -37,7 +36,7 @@ var restartCmd = &cobra.Command{
)
if kubernetesFlag {
namespace = criconstants.K8sContainerdNamespace
namespace = constants.K8sContainerdNamespace
driver = common.ContainerDriver_CRI
} else {
namespace = constants.SystemContainerdNamespace

3
cmd/talosctl/cmd/talos/root.go
View File

@ -11,7 +11,6 @@ import (
"slices"
"strings"
criconstants "github.com/containerd/containerd/pkg/cri/constants"
"github.com/siderolabs/gen/maps"
"github.com/spf13/cobra"
"google.golang.org/grpc"
@ -188,7 +187,7 @@ func getContainersFromNode(kubernetes bool) []string {
)
if kubernetes {
namespace = criconstants.K8sContainerdNamespace
namespace = constants.K8sContainerdNamespace
driver = common.ContainerDriver_CRI
} else {
namespace = constants.SystemContainerdNamespace

3
cmd/talosctl/cmd/talos/stats.go
View File

@ -12,7 +12,6 @@ import (
"strings"
"text/tabwriter"
criconstants "github.com/containerd/containerd/pkg/cri/constants"
"github.com/spf13/cobra"
"google.golang.org/grpc"
"google.golang.org/grpc/peer"
@ -38,7 +37,7 @@ var statsCmd = &cobra.Command{
)
if kubernetesFlag {
namespace = criconstants.K8sContainerdNamespace
namespace = constants.K8sContainerdNamespace
driver = common.ContainerDriver_CRI
} else {
namespace = constants.SystemContainerdNamespace

3
internal/app/machined/internal/server/v1alpha1/v1alpha1_images.go
View File

@ -10,7 +10,6 @@ import (
containerdapi "github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/namespaces"
criconstants "github.com/containerd/containerd/pkg/cri/constants"
"github.com/containerd/containerd/platforms"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
@ -27,7 +26,7 @@ func containerdNamespaceHelper(ctx context.Context, ns common.ContainerdNamespac
switch ns {
case common.ContainerdNamespace_NS_CRI:
namespaceName = criconstants.K8sContainerdNamespace
namespaceName = constants.K8sContainerdNamespace
case common.ContainerdNamespace_NS_SYSTEM:
namespaceName = constants.SystemContainerdNamespace
case common.ContainerdNamespace_NS_UNKNOWN:

3
internal/app/machined/internal/server/v1alpha1/v1alpha1_server.go
View File

@ -23,7 +23,6 @@ import (
"syscall"
"time"
criconstants "github.com/containerd/containerd/pkg/cri/constants"
cosiv1alpha1 "github.com/cosi-project/runtime/api/v1alpha1"
"github.com/cosi-project/runtime/pkg/safe"
"github.com/cosi-project/runtime/pkg/state"
@ -1257,7 +1256,7 @@ func k8slogs(ctx context.Context, req *machine.LogsRequest) (chunker.Chunker, io
func getContainerInspector(ctx context.Context, namespace string, driver common.ContainerDriver) (containers.Inspector, error) {
switch driver {
case common.ContainerDriver_CRI:
if namespace != criconstants.K8sContainerdNamespace {
if namespace != constants.K8sContainerdNamespace {
return nil, errors.New("CRI inspector is supported only for K8s namespace")
}

3
pkg/machinery/constants/constants.go
View File

@ -485,6 +485,9 @@ const (
// SystemContainerdAddress is the path to the system containerd socket.
SystemContainerdAddress = SystemRunPath + "/containerd/containerd.sock"
// K8sContainerdNamespace is the Containerd namespace for CRI pods.
K8sContainerdNamespace = "k8s.io"
// CRIContainerdAddress is the path to the CRI containerd socket address.
CRIContainerdAddress = "/run/containerd/containerd.sock"