diff --git a/pkg/oc/cli/debug/debug.go b/pkg/oc/cli/debug/debug.go
index 4fe8a4b83c25..07ffa73310ab 100644
--- a/pkg/oc/cli/debug/debug.go
+++ b/pkg/oc/cli/debug/debug.go
@@ -139,21 +139,17 @@ type DebugOptions struct {
 }
 
 func NewDebugOptions(streams genericclioptions.IOStreams) *DebugOptions {
+	attachOpts := kcmd.NewAttachOptions(streams)
+	attachOpts.TTY = true
+	attachOpts.Stdin = true
 	return &DebugOptions{
 		PrintFlags:         genericclioptions.NewPrintFlags("").WithTypeSetter(scheme.Scheme),
 		IOStreams:          streams,
 		Timeout:            15 * time.Minute,
 		KeepInitContainers: true,
 		AsUser:             -1,
-		Attach: kcmd.AttachOptions{
-			StreamOptions: kcmd.StreamOptions{
-				IOStreams: streams,
-				TTY:       true,
-				Stdin:     true,
-			},
-			Attach: &kcmd.DefaultRemoteAttach{},
-		},
-		LogsForObject: polymorphichelpers.LogsForObjectFn,
+		Attach:             *attachOpts,
+		LogsForObject:      polymorphichelpers.LogsForObjectFn,
 	}
 }
 
diff --git a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/attach.go b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/attach.go
index 153a1406bebc..602b5234f7d6 100644
--- a/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/attach.go
+++ b/vendor/k8s.io/kubernetes/pkg/kubectl/cmd/attach.go
@@ -89,7 +89,8 @@ func NewAttachOptions(streams genericclioptions.IOStreams) *AttachOptions {
 		StreamOptions: StreamOptions{
 			IOStreams: streams,
 		},
-		Attach: &DefaultRemoteAttach{},
+		Attach:     &DefaultRemoteAttach{},
+		AttachFunc: defaultAttachFunc,
 	}
 }
 
@@ -193,8 +194,6 @@ func (o *AttachOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []s
 	}
 	o.Config = config
 
-	o.AttachFunc = defaultAttachFunc
-
 	if o.CommandName == "" {
 		o.CommandName = cmd.CommandPath()
 	}