Debug should be able to skip init containers

Author: smarterclayton

pkg/cmd/cli/cmd/debug.go

@@ -42,19 +42,20 @@ type DebugOptions struct {
 	Filename   string
 	Timeout    time.Duration
 
-	Command         []string
-	Annotations     map[string]string
-	AsRoot          bool
-	AsNonRoot       bool
-	AsUser          int64
-	KeepLabels      bool // TODO: evaluate selecting the right labels automatically
-	KeepAnnotations bool
-	KeepLiveness    bool
-	KeepReadiness   bool
-	OneContainer    bool
-	NodeName        string
-	AddEnv          []kapi.EnvVar
-	RemoveEnv       []string
+	Command            []string
+	Annotations        map[string]string
+	AsRoot             bool
+	AsNonRoot          bool
+	AsUser             int64
+	KeepLabels         bool // TODO: evaluate selecting the right labels automatically
+	KeepAnnotations    bool
+	KeepLiveness       bool
+	KeepReadiness      bool
+	KeepInitContainers bool
+	OneContainer       bool
+	NodeName           string
+	AddEnv             []kapi.EnvVar
+	RemoveEnv          []string
 }
 
 const (
@@ -146,6 +147,7 @@ func NewCmdDebug(fullName string, f *clientcmd.Factory, in io.Reader, out, errou
 	cmd.Flags().StringVarP(&options.Attach.ContainerName, "container", "c", "", "Container name; defaults to first container")
 	cmd.Flags().BoolVar(&options.KeepAnnotations, "keep-annotations", false, "Keep the original pod annotations")
 	cmd.Flags().BoolVar(&options.KeepLiveness, "keep-liveness", false, "Keep the original pod liveness probes")
+	cmd.Flags().BoolVar(&options.KeepInitContainers, "keep-init-containers", true, "Run the init containers for the pod. Defaults to true.")
 	cmd.Flags().BoolVar(&options.KeepReadiness, "keep-readiness", false, "Keep the original pod readiness probes")
 	cmd.Flags().BoolVar(&options.OneContainer, "one-container", false, "Run only the selected container, remove all others")
 	cmd.Flags().StringVar(&options.NodeName, "node-name", "", "Set a specific node to run on - by default the pod will run on any valid node")
@@ -379,6 +381,10 @@ func (o *DebugOptions) Debug() error {
 func (o *DebugOptions) transformPodForDebug(annotations map[string]string) (*kapi.Pod, []string) {
 	pod := o.Attach.Pod
 
+	if !o.KeepInitContainers {
+		pod.Spec.InitContainers = nil
+	}
+
 	// reset the container
 	container := containerForName(pod, o.Attach.ContainerName)