Revert "feat: support bi-directional container management"

This reverts commit 2c21479.

internal/adapter/container_utils.go

@@ -498,7 +498,3 @@ func (adapter *KubeDockerAdapter) DeployPortainerEdgeAgent(ctx context.Context,
 
 	return nil
 }
-
-func isContainerInNamespace(container *types.Container, namespace string) bool {
-	return namespace == "" || container.Labels[k2dtypes.NamespaceNameLabelKey] == namespace
-}

internal/adapter/namespace_utils.go

@@ -10,10 +10,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func isDefaultOrEmptyNamespace(namespace string) bool {
-	return namespace == "" || namespace == "default"
-}
-
 // provisionNamespace provisions a Kubernetes namespace and its corresponding Docker network.
 //
 // The function performs the following steps:

internal/adapter/pod.go

@@ -7,9 +7,14 @@ import (
 	"io"
 
 	"github.com/docker/docker/api/types"
+	"github.com/portainer/k2d/internal/adapter/errors"
+	"github.com/portainer/k2d/internal/adapter/filters"
+	"github.com/portainer/k2d/internal/adapter/naming"
+	k2dtypes "github.com/portainer/k2d/internal/adapter/types"
 	"github.com/portainer/k2d/internal/k8s"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/kubernetes/pkg/apis/core"
 )
 
 type PodLogOptions struct {
@@ -39,29 +44,31 @@ func (adapter *KubeDockerAdapter) CreateContainerFromPod(ctx context.Context, po
 	return adapter.createContainerFromPodSpec(ctx, opts)
 }
 
-func (adapter *KubeDockerAdapter) DeletePod(ctx context.Context, podName string, namespace string) error {
-	container, err := adapter.findContainerFromPodAndNamespace(ctx, podName, namespace)
-	if err != nil {
-		return fmt.Errorf("unable to find container associated to the pod %s/%s: %w", namespace, podName, err)
-	}
-
-	err = adapter.cli.ContainerRemove(ctx, container.Names[0], types.ContainerRemoveOptions{Force: true})
-	if err != nil {
-		adapter.logger.Warnf("unable to remove container: %s", err)
-	}
-
-	return nil
-}
-
 // The GetPod implementation is using a filtered list approach as the Docker API provide different response types
 // when inspecting a container and listing containers.
 // The logic used to build a pod from a container is based on the type returned by the list operation (types.Container)
 // and not the inspect operation (types.ContainerJSON).
 // This is because using the inspect operation everywhere would be more expensive overall.
 func (adapter *KubeDockerAdapter) GetPod(ctx context.Context, podName string, namespace string) (*corev1.Pod, error) {
-	container, err := adapter.findContainerFromPodAndNamespace(ctx, podName, namespace)
+	filter := filters.ByPod(namespace, podName)
+	containers, err := adapter.cli.ContainerList(ctx, types.ContainerListOptions{All: true, Filters: filter})
 	if err != nil {
-		return nil, fmt.Errorf("unable to find container associated to the pod %s/%s: %w", namespace, podName, err)
+		return nil, fmt.Errorf("unable to list containers: %w", err)
+	}
+
+	var container *types.Container
+
+	containerName := naming.BuildContainerName(podName, namespace)
+	for _, cntr := range containers {
+		if cntr.Names[0] == "/"+containerName {
+			container = &cntr
+			break
+		}
+	}
+
+	if container == nil {
+		adapter.logger.Errorf("unable to find container for pod %s in namespace %s", podName, namespace)
+		return nil, errors.ErrResourceNotFound
 	}
 
 	pod, err := adapter.buildPodFromContainer(*container)
@@ -76,7 +83,7 @@ func (adapter *KubeDockerAdapter) GetPod(ctx context.Context, podName string, na
 		},
 	}
 
-	err = adapter.ConvertK8SResource(&pod, &versionedPod)
+	err = adapter.ConvertK8SResource(pod, &versionedPod)
 	if err != nil {
 		return nil, fmt.Errorf("unable to convert internal object to versioned object: %w", err)
 	}
@@ -85,9 +92,10 @@ func (adapter *KubeDockerAdapter) GetPod(ctx context.Context, podName string, na
 }
 
 func (adapter *KubeDockerAdapter) GetPodLogs(ctx context.Context, namespace string, podName string, opts PodLogOptions) (io.ReadCloser, error) {
-	container, err := adapter.findContainerFromPodAndNamespace(ctx, podName, namespace)
+	containerName := naming.BuildContainerName(podName, namespace)
+	container, err := adapter.cli.ContainerInspect(ctx, containerName)
 	if err != nil {
-		return nil, fmt.Errorf("unable to find container associated to the pod %s/%s: %w", namespace, podName, err)
+		return nil, fmt.Errorf("unable to inspect container: %w", err)
 	}
 
 	return adapter.cli.ContainerLogs(ctx, container.ID, types.ContainerLogsOptions{
@@ -100,7 +108,7 @@ func (adapter *KubeDockerAdapter) GetPodLogs(ctx context.Context, namespace stri
 }
 
 func (adapter *KubeDockerAdapter) GetPodTable(ctx context.Context, namespace string) (*metav1.Table, error) {
-	podList, err := adapter.getPodListFromContainers(ctx, namespace)
+	podList, err := adapter.listPods(ctx, namespace)
 	if err != nil {
 		return &metav1.Table{}, fmt.Errorf("unable to list pods: %w", err)
 	}
@@ -109,7 +117,7 @@ func (adapter *KubeDockerAdapter) GetPodTable(ctx context.Context, namespace str
 }
 
 func (adapter *KubeDockerAdapter) ListPods(ctx context.Context, namespace string) (corev1.PodList, error) {
-	podList, err := adapter.getPodListFromContainers(ctx, namespace)
+	podList, err := adapter.listPods(ctx, namespace)
 	if err != nil {
 		return corev1.PodList{}, fmt.Errorf("unable to list pods: %w", err)
 	}
@@ -128,3 +136,48 @@ func (adapter *KubeDockerAdapter) ListPods(ctx context.Context, namespace string
 
 	return versionedPodList, nil
 }
+
+func (adapter *KubeDockerAdapter) buildPodFromContainer(container types.Container) (*core.Pod, error) {
+	pod := adapter.converter.ConvertContainerToPod(container)
+
+	if container.Labels[k2dtypes.PodLastAppliedConfigLabelKey] != "" {
+		internalPodSpecData := container.Labels[k2dtypes.PodLastAppliedConfigLabelKey]
+		podSpec := core.PodSpec{}
+
+		err := json.Unmarshal([]byte(internalPodSpecData), &podSpec)
+		if err != nil {
+			return nil, fmt.Errorf("unable to unmarshal pod spec: %w", err)
+		}
+
+		pod.Spec = podSpec
+	}
+
+	return &pod, nil
+}
+
+func (adapter *KubeDockerAdapter) listPods(ctx context.Context, namespace string) (core.PodList, error) {
+	filter := filters.ByNamespace(namespace)
+	containers, err := adapter.cli.ContainerList(ctx, types.ContainerListOptions{All: true, Filters: filter})
+	if err != nil {
+		return core.PodList{}, fmt.Errorf("unable to list containers: %w", err)
+	}
+
+	pods := []core.Pod{}
+
+	for _, container := range containers {
+		pod, err := adapter.buildPodFromContainer(container)
+		if err != nil {
+			return core.PodList{}, fmt.Errorf("unable to get pods: %w", err)
+		}
+
+		pods = append(pods, *pod)
+	}
+
+	return core.PodList{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "PodList",
+			APIVersion: "v1",
+		},
+		Items: pods,
+	}, nil
+}

internal/api/core/v1/pods/delete.go

@@ -12,7 +12,7 @@ func (svc PodService) DeletePod(r *restful.Request, w *restful.Response) {
 	namespace := utils.GetNamespaceFromRequest(r)
 
 	podName := r.PathParameter("name")
-	svc.adapter.DeletePod(r.Request.Context(), podName, namespace)
+	svc.adapter.DeleteContainer(r.Request.Context(), podName, namespace)
 
 	w.WriteAsJson(metav1.Status{
 		TypeMeta: metav1.TypeMeta{