Add agentless mode to debug target pod when there isn't an agent running on target host

pkg/plugin/cmd.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"k8s.io/apimachinery/pkg/labels"
 	"log"
 	"net/http"
 	"net/url"
@@ -15,11 +14,14 @@ import (
 	"sync"
 	"time"
 
-	"github.com/aylei/kubectl-debug/pkg/util"
+	"k8s.io/apimachinery/pkg/labels"
+
+	term "github.com/aylei/kubectl-debug/pkg/util"
 	dockerterm "github.com/docker/docker/pkg/term"
 	"github.com/spf13/cobra"
 	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/apis/meta/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/util/uuid"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/kubernetes"
@@ -63,6 +65,10 @@ You may set default configuration such as image and command in the config file,
 	defaultDaemonSetNs    = "default"
 
 	usageError = "expects 'debug POD_NAME' for debug command"
+
+	defaultAgentImage         = "aylei/debug-agent:latest"
+	defaultAgentPodNamePrefix = "debug-agent-pod-"
+	defaultAgentPodNamespace  = "default"
 )
 
 // DebugOptions specify how to run debug container in a running pod
@@ -81,6 +87,14 @@ type DebugOptions struct {
 	ConfigLocation string
 	Fork           bool
 
+	//used for agentless mode
+	AgentLess  bool
+	AgentImage string
+	// agentPodName = agentPodNamePrefix + nodeName
+	AgentPodName      string
+	AgentPodNamespace string
+	AgentPodNode      string
+
 	Flags      *genericclioptions.ConfigFlags
 	CoreClient coreclient.CoreV1Interface
 	KubeCli    *kubernetes.Clientset
@@ -149,6 +163,14 @@ func NewDebugCmd(streams genericclioptions.IOStreams) *cobra.Command {
 		"Debug agent daemonset name when using port-forward")
 	cmd.Flags().StringVar(&opts.DebugAgentNamespace, "daemonset-ns", opts.DebugAgentNamespace,
 		"Debug agent namespace, default to 'default'")
+	// flags used for agentless mode.
+	cmd.Flags().BoolVarP(&opts.AgentLess, "agentless", "a", false, "Whether to turn on agentless mode. Agentless mode: debug target pod if there isn't an agent running on the target host.")
+	cmd.Flags().StringVar(&opts.AgentImage, "agent-image", "",
+		fmt.Sprintf("Agentless mode, the container Image to run the agent container , default to %s", defaultAgentImage))
+	cmd.Flags().StringVar(&opts.AgentPodName, "agent-pod-name-prefix", "",
+		fmt.Sprintf("Agentless mode, pod name prefix , default to %s", defaultAgentPodNamePrefix))
+	cmd.Flags().StringVar(&opts.AgentPodNamespace, "agent-pod-namespace", "",
+		fmt.Sprintf("Agentless mode, agent pod namespace, default to %s", defaultAgentPodNamespace))
 	opts.Flags.AddFlags(cmd.Flags())
 
 	return cmd
@@ -231,6 +253,31 @@ func (o *DebugOptions) Complete(cmd *cobra.Command, args []string, argsLenAtDash
 			o.DebugAgentDaemonSet = defaultDaemonSetName
 		}
 	}
+
+	if len(o.AgentPodName) < 1 {
+		if len(config.AgentPodNamePrefix) > 0 {
+			o.AgentPodName = config.AgentPodNamePrefix
+		} else {
+			o.AgentPodName = defaultAgentPodNamePrefix
+		}
+	}
+
+	if len(o.AgentImage) < 1 {
+		if len(config.AgentImage) > 0 {
+			o.AgentImage = config.AgentImage
+		} else {
+			o.AgentImage = defaultAgentImage
+		}
+	}
+
+	if len(o.AgentPodNamespace) < 1 {
+		if len(config.AgentPodNamespace) > 0 {
+			o.AgentPodNamespace = config.AgentPodNamespace
+		} else {
+			o.AgentPodNamespace = defaultAgentPodNamespace
+		}
+	}
+
 	if config.PortForward {
 		o.PortForward = true
 	}
@@ -277,29 +324,28 @@ func (o *DebugOptions) Run() error {
 		}
 		containerName = pod.Spec.Containers[0].Name
 	}
+	// Launch debug launching pod in agentless mode.
+	var agentPod *corev1.Pod
+	if o.AgentLess {
+		o.AgentPodNode = pod.Spec.NodeName
+		// add node name as suffix
+		o.AgentPodName = o.AgentPodName + o.AgentPodNode
+		agentPod = o.getAgentPod()
+		agentPod, err = launchPod(agentPod, o.CoreClient)
+		if err != nil {
+			return err
+		}
+	}
 
 	// in fork mode, we launch an new pod as a copy of target pod
 	// and hack the entry point of the target container with sleep command
 	// which keeps the container running.
 	if o.Fork {
 		pod = copyAndStripPod(pod, containerName)
-		pod, err = o.CoreClient.Pods(pod.Namespace).Create(pod)
+		pod, err = launchPod(pod, o.CoreClient)
 		if err != nil {
 			return err
 		}
-		watcher, err := o.CoreClient.Pods(pod.Namespace).Watch(v1.SingleObject(pod.ObjectMeta))
-		if err != nil {
-			return err
-		}
-		// FIXME: hard code -> config
-		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
-		defer cancel()
-		log.Println("waiting for forked container running...")
-		event, err := watch.UntilWithoutRetry(ctx, watcher, conditions.PodRunning)
-		if err != nil {
-			return err
-		}
-		pod = event.Object.(*corev1.Pod)
 	}
 
 	if pod.Status.Phase == corev1.PodSucceeded || pod.Status.Phase == corev1.PodFailed {
@@ -322,23 +368,28 @@ func (o *DebugOptions) Run() error {
 	}
 
 	if o.PortForward {
-		daemonSet, err := o.KubeCli.AppsV1().DaemonSets(o.DebugAgentNamespace).Get(o.DebugAgentDaemonSet, v1.GetOptions{})
-		if err != nil {
-			return err
-		}
-		labelSet := labels.Set(daemonSet.Spec.Selector.MatchLabels)
-		agents, err := o.CoreClient.Pods(o.DebugAgentNamespace).List(v1.ListOptions{
-			LabelSelector: labelSet.String(),
-		})
-		if err != nil {
-			return err
-		}
 		var agent *corev1.Pod
-		for i := range agents.Items {
-			if agents.Items[i].Spec.NodeName == pod.Spec.NodeName {
-				agent = &agents.Items[i]
-				break
+		if !o.AgentLess {
+			// Agent is running
+			daemonSet, err := o.KubeCli.AppsV1().DaemonSets(o.DebugAgentNamespace).Get(o.DebugAgentDaemonSet, v1.GetOptions{})
+			if err != nil {
+				return err
+			}
+			labelSet := labels.Set(daemonSet.Spec.Selector.MatchLabels)
+			agents, err := o.CoreClient.Pods(o.DebugAgentNamespace).List(v1.ListOptions{
+				LabelSelector: labelSet.String(),
+			})
+			if err != nil {
+				return err
+			}
+			for i := range agents.Items {
+				if agents.Items[i].Spec.NodeName == pod.Spec.NodeName {
+					agent = &agents.Items[i]
+					break
+				}
 			}
+		} else {
+			agent = agentPod
 		}
 
 		if agent == nil {
@@ -386,10 +437,11 @@ func (o *DebugOptions) Run() error {
 	withCleanUp := func() error {
 		return interrupt.Chain(nil, func() {
 			if o.Fork {
+				log.Printf("Start deleting forked pod %s \r", pod.Name)
 				err := o.CoreClient.Pods(pod.Namespace).Delete(pod.Name, v1.NewDeleteOptions(0))
 				if err != nil {
 					// we may leak pod here, but we have nothing to do except noticing the user
-					log.Printf("failed to delete pod %s, consider manual deletion.", pod.Name)
+					log.Printf("failed to delete forked pod %s, consider manual deletion.\r", pod.Name)
 				}
 			}
 
@@ -399,6 +451,15 @@ func (o *DebugOptions) Run() error {
 					close(o.StopChannel)
 				}
 			}
+			// delete agent pod
+			if o.AgentLess && agentPod != nil {
+				log.Printf("Start deleting agent pod %s \r", agentPod.Name)
+				err := o.CoreClient.Pods(agentPod.Namespace).Delete(agentPod.Name, v1.NewDeleteOptions(0))
+				if err != nil {
+					// we may leak pod here, but we have nothing to do except noticing the user
+					log.Printf("failed to delete agent pod %s, consider manual deletion.\r", agentPod.Name)
+				}
+			}
 		}).Run(fn)
 	}
 
@@ -507,6 +568,94 @@ func copyAndStripPod(pod *corev1.Pod, targetContainer string) *corev1.Pod {
 	return copied
 }
 
+// launchPod launch given pod until it's running
+func launchPod(pod *corev1.Pod, client coreclient.CoreV1Interface) (*corev1.Pod, error) {
+	pod, err := client.Pods(pod.Namespace).Create(pod)
+	if err != nil {
+		return pod, err
+	}
+
+	watcher, err := client.Pods(pod.Namespace).Watch(v1.SingleObject(pod.ObjectMeta))
+	if err != nil {
+		return nil, err
+	}
+	// FIXME: hard code -> config
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	defer cancel()
+	log.Printf("waiting for pod %s to run...\r", pod.Name)
+	event, err := watch.UntilWithoutRetry(ctx, watcher, conditions.PodRunning)
+	if err != nil {
+		log.Printf("Error occurred while waiting for pod to run:  %v\r", err)
+		return nil, err
+	}
+	pod = event.Object.(*corev1.Pod)
+	return pod, nil
+}
+
+// getAgentPod construnct agentPod from agent pod template
+func (o *DebugOptions) getAgentPod() *corev1.Pod {
+	agentPod := &corev1.Pod{
+		TypeMeta: v1.TypeMeta{
+			Kind:       "Pod",
+			APIVersion: "v1",
+		},
+		ObjectMeta: v1.ObjectMeta{
+			Name:      o.AgentPodName,
+			Namespace: o.AgentPodNamespace,
+		},
+		Spec: corev1.PodSpec{
+			NodeName: o.AgentPodNode,
+			Containers: []corev1.Container{
+				{
+					Name:            "debug-agent",
+					Image:           o.AgentImage,
+					ImagePullPolicy: corev1.PullAlways,
+					LivenessProbe: &corev1.Probe{
+						Handler: corev1.Handler{
+							HTTPGet: &corev1.HTTPGetAction{
+								Path: "/healthz",
+								Port: intstr.FromInt(10027),
+							},
+						},
+						InitialDelaySeconds: 10,
+						PeriodSeconds:       10,
+						SuccessThreshold:    1,
+						TimeoutSeconds:      1,
+						FailureThreshold:    3,
+					},
+					VolumeMounts: []corev1.VolumeMount{
+						{
+							Name:      "docker",
+							MountPath: "/var/run/docker.sock",
+						},
+					},
+					Ports: []corev1.ContainerPort{
+						{
+							Name:          "http",
+							HostPort:      int32(o.AgentPort),
+							ContainerPort: 10027,
+						},
+					},
+				},
+			},
+			Volumes: []corev1.Volume{
+				{
+					Name: "docker",
+					VolumeSource: corev1.VolumeSource{
+						HostPath: &corev1.HostPathVolumeSource{
+							Path: "/var/run/docker.sock",
+						},
+					},
+				},
+			},
+			RestartPolicy: corev1.RestartPolicyNever,
+		},
+	}
+	log.Print(fmt.Sprintln("Agent Pod info: [", "Name:", agentPod.ObjectMeta.Name, "Namespace:", agentPod.ObjectMeta.Namespace, "Image:", agentPod.Spec.Containers[0].Image, "HostPort:", agentPod.Spec.Containers[0].Ports[0].HostPort, "ContainerPort:", agentPod.Spec.Containers[0].Ports[0].ContainerPort,
+		"]"))
+	return agentPod
+}
+
 func (o *DebugOptions) runPortForward(pod *corev1.Pod) error {
 	if pod.Status.Phase != corev1.PodRunning {
 		return fmt.Errorf("unable to forward port because pod is not running. Current status=%v", pod.Status.Phase)

pkg/plugin/config.go

@@ -13,6 +13,9 @@ type Config struct {
 	DebugAgentNamespace string   `yaml:"debugAgentNamespace,omitempty"`
 	Command             []string `yaml:"command,omitempty"`
 	PortForward         bool     `yaml:"portForward,omitempty"`
+	AgentPodNamePrefix  string   `yaml:"agentPodNamePrefix,omitempty"`
+	AgentPodNamespace   string   `yaml:"agentPodNamespace,omitempty"`
+	AgentImage          string   `yaml:"agentImage,omitempty"`
 
 	// deprecated
 	AgentPortOld int `yaml:"agent_port,omitempty"`

scripts/agent_daemonset.yml

@@ -35,7 +35,7 @@ spec:
         volumeMounts:
         - name: docker
           mountPath: "/var/run/docker.sock"
-      hostNetwork: true
+      # hostNetwork: true
       volumes:
       - name: docker
         hostPath: