diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 102dd0386..1dbe43a40 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -924,11 +924,11 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "9c6b1a9487e0"
+			"Rev": "47952fe781b3"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "0ca7b349afd2"
+			"Rev": "6c16abd71758"
 		},
 		{
 			"ImportPath": "k8s.io/cli-runtime",
@@ -936,7 +936,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "e9d996dae239"
+			"Rev": "9761a13537eb"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
diff --git a/go.mod b/go.mod
index 3fd300937..0b3494bb7 100644
--- a/go.mod
+++ b/go.mod
@@ -34,10 +34,10 @@ require (
 	github.com/stretchr/testify v1.6.1
 	golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
 	gopkg.in/yaml.v2 v2.2.8
-	k8s.io/api v0.0.0-20201218085720-9c6b1a9487e0
-	k8s.io/apimachinery v0.0.0-20210103120354-0ca7b349afd2
+	k8s.io/api v0.0.0-20210106170055-47952fe781b3
+	k8s.io/apimachinery v0.0.0-20210106165743-6c16abd71758
 	k8s.io/cli-runtime v0.0.0-20201218091240-9547a43879a0
-	k8s.io/client-go v0.0.0-20201229090012-e9d996dae239
+	k8s.io/client-go v0.0.0-20210106050432-9761a13537eb
 	k8s.io/component-base v0.0.0-20201217090229-e05af43f81e2
 	k8s.io/component-helpers v0.0.0-20201217090330-fc14ecbd38ba
 	k8s.io/klog/v2 v2.4.0
@@ -49,10 +49,10 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20201218085720-9c6b1a9487e0
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210103120354-0ca7b349afd2
+	k8s.io/api => k8s.io/api v0.0.0-20210106170055-47952fe781b3
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210106165743-6c16abd71758
 	k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20201218091240-9547a43879a0
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20201229090012-e9d996dae239
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20210106050432-9761a13537eb
 	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201211071722-8cc0d294774b
 	k8s.io/component-base => k8s.io/component-base v0.0.0-20201217090229-e05af43f81e2
 	k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20201217090330-fc14ecbd38ba
diff --git a/go.sum b/go.sum
index 6ef690bb5..996a39ea5 100644
--- a/go.sum
+++ b/go.sum
@@ -632,10 +632,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.0.0-20201218085720-9c6b1a9487e0/go.mod h1:RfHTN0YuX1yj8GjBNCMS6JbbdmX/jjszu9vXIt47SpM=
-k8s.io/apimachinery v0.0.0-20210103120354-0ca7b349afd2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
+k8s.io/api v0.0.0-20210106170055-47952fe781b3/go.mod h1:jMmEuFXZmOAJP842CJAbtlCqWhG/8ZuH9/e/xQT+Xq8=
+k8s.io/apimachinery v0.0.0-20210106165743-6c16abd71758/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
 k8s.io/cli-runtime v0.0.0-20201218091240-9547a43879a0/go.mod h1:YGZiEr0qwB6XSdVC2kbXtQG/+bm7+18eWKXckr167Io=
-k8s.io/client-go v0.0.0-20201229090012-e9d996dae239/go.mod h1:QnFOWF5TLJOP+E4gUNVwc3EPtaB+ZB8WGcyyBDoOHyI=
+k8s.io/client-go v0.0.0-20210106050432-9761a13537eb/go.mod h1:MzH4jwc+euEAiFUHId2xQ1P0F4jHAQrNxngF8rnIIqY=
 k8s.io/code-generator v0.0.0-20201211071722-8cc0d294774b/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
 k8s.io/component-base v0.0.0-20201217090229-e05af43f81e2/go.mod h1:gIi+MRY/IzqtOlI456xyiW/eLgJnlivhxgZIlG3ueCQ=
 k8s.io/component-helpers v0.0.0-20201217090330-fc14ecbd38ba/go.mod h1:N07y96+Qak71e9ctvZvqaa4nOXDcJaffiGOlDU5Qj28=
diff --git a/pkg/cmd/portforward/portforward.go b/pkg/cmd/portforward/portforward.go
index 3573a921e..a6c1bac8c 100644
--- a/pkg/cmd/portforward/portforward.go
+++ b/pkg/cmd/portforward/portforward.go
@@ -110,15 +110,9 @@ func NewCmdPortForward(f cmdutil.Factory, streams genericclioptions.IOStreams) *
 		Long:                  portforwardLong,
 		Example:               portforwardExample,
 		Run: func(cmd *cobra.Command, args []string) {
-			if err := opts.Complete(f, cmd, args); err != nil {
-				cmdutil.CheckErr(err)
-			}
-			if err := opts.Validate(); err != nil {
-				cmdutil.CheckErr(cmdutil.UsageErrorf(cmd, "%v", err.Error()))
-			}
-			if err := opts.RunPortForward(); err != nil {
-				cmdutil.CheckErr(err)
-			}
+			cmdutil.CheckErr(opts.Complete(f, cmd, args))
+			cmdutil.CheckErr(opts.Validate())
+			cmdutil.CheckErr(opts.RunPortForward())
 		},
 	}
 	cmdutil.AddPodRunningTimeoutFlag(cmd, defaultPodPortForwardWaitTimeout)