diff --git a/pkg/kubectl/describe/versioned/BUILD b/pkg/kubectl/describe/versioned/BUILD
index 06d190db3fb..8fefd4813ed 100644
--- a/pkg/kubectl/describe/versioned/BUILD
+++ b/pkg/kubectl/describe/versioned/BUILD
@@ -8,7 +8,6 @@ go_library(
     deps = [
         "//pkg/kubectl/describe:go_default_library",
         "//pkg/kubectl/scheme:go_default_library",
-        "//pkg/kubectl/util/fieldpath:go_default_library",
         "//pkg/kubectl/util/slice:go_default_library",
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/autoscaling/v1:go_default_library",
@@ -44,6 +43,7 @@ go_library(
         "//staging/src/k8s.io/kubectl/pkg/util/certificate:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/deployment:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/event:go_default_library",
+        "//staging/src/k8s.io/kubectl/pkg/util/fieldpath:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/qos:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/rbac:go_default_library",
         "//staging/src/k8s.io/kubectl/pkg/util/resource:go_default_library",
diff --git a/pkg/kubectl/describe/versioned/describe.go b/pkg/kubectl/describe/versioned/describe.go
index b86a7296ca3..119946cb1a4 100644
--- a/pkg/kubectl/describe/versioned/describe.go
+++ b/pkg/kubectl/describe/versioned/describe.go
@@ -68,13 +68,13 @@ import (
 	"k8s.io/kubectl/pkg/util/certificate"
 	deploymentutil "k8s.io/kubectl/pkg/util/deployment"
 	"k8s.io/kubectl/pkg/util/event"
+	"k8s.io/kubectl/pkg/util/fieldpath"
 	"k8s.io/kubectl/pkg/util/qos"
 	"k8s.io/kubectl/pkg/util/rbac"
 	resourcehelper "k8s.io/kubectl/pkg/util/resource"
 	storageutil "k8s.io/kubectl/pkg/util/storage"
 	"k8s.io/kubernetes/pkg/kubectl/describe"
 	"k8s.io/kubernetes/pkg/kubectl/scheme"
-	"k8s.io/kubernetes/pkg/kubectl/util/fieldpath"
 	"k8s.io/kubernetes/pkg/kubectl/util/slice"
 )
 
diff --git a/pkg/kubectl/util/BUILD b/pkg/kubectl/util/BUILD
index 71177611279..098352f6b35 100644
--- a/pkg/kubectl/util/BUILD
+++ b/pkg/kubectl/util/BUILD
@@ -66,7 +66,6 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
-        "//pkg/kubectl/util/fieldpath:all-srcs",
         "//pkg/kubectl/util/i18n:all-srcs",
         "//pkg/kubectl/util/logs:all-srcs",
         "//pkg/kubectl/util/slice:all-srcs",
diff --git a/staging/src/k8s.io/kubectl/BUILD b/staging/src/k8s.io/kubectl/BUILD
index 7a2d2e34cf3..eb57a39e8eb 100644
--- a/staging/src/k8s.io/kubectl/BUILD
+++ b/staging/src/k8s.io/kubectl/BUILD
@@ -12,6 +12,7 @@ filegroup(
         "//staging/src/k8s.io/kubectl/pkg/util/certificate:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/deployment:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/event:all-srcs",
+        "//staging/src/k8s.io/kubectl/pkg/util/fieldpath:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/hash:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/interrupt:all-srcs",
         "//staging/src/k8s.io/kubectl/pkg/util/podutils:all-srcs",
diff --git a/pkg/kubectl/util/fieldpath/BUILD b/staging/src/k8s.io/kubectl/pkg/util/fieldpath/BUILD
similarity index 84%
rename from pkg/kubectl/util/fieldpath/BUILD
rename to staging/src/k8s.io/kubectl/pkg/util/fieldpath/BUILD
index 188a07d00d4..37682adb7ce 100644
--- a/pkg/kubectl/util/fieldpath/BUILD
+++ b/staging/src/k8s.io/kubectl/pkg/util/fieldpath/BUILD
@@ -3,7 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["fieldpath.go"],
-    importpath = "k8s.io/kubernetes/pkg/kubectl/util/fieldpath",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/kubectl/pkg/util/fieldpath",
+    importpath = "k8s.io/kubectl/pkg/util/fieldpath",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/api/meta:go_default_library",
diff --git a/pkg/kubectl/util/fieldpath/fieldpath.go b/staging/src/k8s.io/kubectl/pkg/util/fieldpath/fieldpath.go
similarity index 100%
rename from pkg/kubectl/util/fieldpath/fieldpath.go
rename to staging/src/k8s.io/kubectl/pkg/util/fieldpath/fieldpath.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 6d4e904834d..32e224fe70c 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1639,6 +1639,7 @@ k8s.io/kube-scheduler/config/v1alpha1
 k8s.io/kubectl/pkg/util/certificate
 k8s.io/kubectl/pkg/util/deployment
 k8s.io/kubectl/pkg/util/event
+k8s.io/kubectl/pkg/util/fieldpath
 k8s.io/kubectl/pkg/util/hash
 k8s.io/kubectl/pkg/util/interrupt
 k8s.io/kubectl/pkg/util/podutils