diff --git a/hack/.golint_failures b/hack/.golint_failures
index b7d0181f74..50d19681a7 100644
--- a/hack/.golint_failures
+++ b/hack/.golint_failures
@@ -475,7 +475,6 @@ staging/src/k8s.io/apimachinery/pkg/api/meta
 staging/src/k8s.io/apimachinery/pkg/api/resource
 staging/src/k8s.io/apimachinery/pkg/api/validation
 staging/src/k8s.io/apimachinery/pkg/api/validation/path
-staging/src/k8s.io/apimachinery/pkg/apis/config/v1alpha1
 staging/src/k8s.io/apimachinery/pkg/apis/meta/fuzzer
 staging/src/k8s.io/apimachinery/pkg/apis/meta/internalversion
 staging/src/k8s.io/apimachinery/pkg/apis/meta/v1
@@ -532,7 +531,6 @@ staging/src/k8s.io/apiserver/pkg/apis/audit
 staging/src/k8s.io/apiserver/pkg/apis/audit/v1
 staging/src/k8s.io/apiserver/pkg/apis/audit/v1alpha1
 staging/src/k8s.io/apiserver/pkg/apis/audit/v1beta1
-staging/src/k8s.io/apiserver/pkg/apis/config/v1alpha1
 staging/src/k8s.io/apiserver/pkg/apis/example
 staging/src/k8s.io/apiserver/pkg/apis/example/v1
 staging/src/k8s.io/apiserver/pkg/apis/example2
@@ -662,6 +660,7 @@ staging/src/k8s.io/code-generator/cmd/client-gen/types
 staging/src/k8s.io/code-generator/cmd/conversion-gen/generators
 staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf
 staging/src/k8s.io/code-generator/cmd/lister-gen/generators
+staging/src/k8s.io/component-base/config/v1alpha1
 staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration
 staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1
 staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1
diff --git a/hack/import-restrictions.yaml b/hack/import-restrictions.yaml
index 1ffa5ef096..3cfc3847f4 100644
--- a/hack/import-restrictions.yaml
+++ b/hack/import-restrictions.yaml
@@ -50,6 +50,13 @@
   - k8s.io/kube-openapi
   - k8s.io/klog
 
+- baseImportPath: "./vendor/k8s.io/component-base/"
+  allowedImports:
+  - k8s.io/apimachinery
+  - k8s.io/component-base
+  - k8s.io/klog
+  - k8s.io/utils
+
 - baseImportPath: "./vendor/k8s.io/client-go/"
   allowedImports:
   - k8s.io/api
@@ -142,23 +149,29 @@
 - baseImportPath: "./vendor/k8s.io/kube-controller-manager/"
   allowedImports:
   - k8s.io/apimachinery
-  - k8s.io/apiserver
+  - k8s.io/component-base
+  - k8s.io/klog
   - k8s.io/utils
 
 - baseImportPath: "./vendor/k8s.io/kube-proxy/"
   allowedImports:
   - k8s.io/apimachinery
+  - k8s.io/component-base
+  - k8s.io/klog
+  - k8s.io/utils
 
 - baseImportPath: "./vendor/k8s.io/kube-scheduler/"
   allowedImports:
   - k8s.io/apimachinery
-  - k8s.io/apiserver
+  - k8s.io/component-base
+  - k8s.io/klog
   - k8s.io/utils
 
 - baseImportPath: "./vendor/k8s.io/kubelet/"
   allowedImports:
   - k8s.io/api
   - k8s.io/apimachinery
+  - k8s.io/klog
 
 - baseImportPath: "./vendor/k8s.io/cluster-bootstrap/"
   allowedImports:
diff --git a/pkg/controller/.import-restrictions b/pkg/controller/.import-restrictions
index c96ccd7dce..db246c010a 100644
--- a/pkg/controller/.import-restrictions
+++ b/pkg/controller/.import-restrictions
@@ -39,8 +39,6 @@
         "k8s.io/apimachinery/pkg/api/meta",
         "k8s.io/apimachinery/pkg/api/meta/testrestmapper",
         "k8s.io/apimachinery/pkg/api/resource",
-        "k8s.io/apimachinery/pkg/apis/config",
-        "k8s.io/apimachinery/pkg/apis/config/v1alpha1",
         "k8s.io/apimachinery/pkg/apis/meta/v1",
         "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
         "k8s.io/apimachinery/pkg/conversion",
@@ -63,8 +61,6 @@
         "k8s.io/apimachinery/pkg/util/wait",
         "k8s.io/apimachinery/pkg/util/version",
         "k8s.io/apimachinery/pkg/watch",
-        "k8s.io/apiserver/pkg/apis/config",
-        "k8s.io/apiserver/pkg/apis/config/v1alpha1",
         "k8s.io/apiserver/pkg/authentication/serviceaccount",
         "k8s.io/apiserver/pkg/storage/names",
         "k8s.io/apiserver/pkg/util/feature",
@@ -91,7 +87,9 @@
         "k8s.io/api/settings/v1alpha1",
         "k8s.io/api/admission/v1beta1",
         "k8s.io/api/networking/v1",
-        "k8s.io/api/admissionregistration/v1alpha1"
+        "k8s.io/api/admissionregistration/v1alpha1",
+        "k8s.io/component-base/config",
+        "k8s.io/component-base/config/v1alpha1"
       ]
     },
     {
diff --git a/staging/README.md b/staging/README.md
index c33acbcfa9..61b1bb374f 100644
--- a/staging/README.md
+++ b/staging/README.md
@@ -15,6 +15,7 @@ Repositories currently staged here:
 - [`k8s.io/cloud-provider`](https://github.com/kubernetes/cloud-provider)
 - [`k8s.io/cluster-bootstrap`](https://github.com/kubernetes/cluster-bootstrap)
 - [`k8s.io/code-generator`](https://github.com/kubernetes/code-generator)
+- [`k8s.io/component-base`](https://github.com/kubernetes/component-base)
 - [`k8s.io/csi-api`](https://github.com/kubernetes/csi-api)
 - [`k8s.io/kube-aggregator`](https://github.com/kubernetes/kube-aggregator)
 - [`k8s.io/kube-controller-manager`](https://github.com/kubernetes/kube-controller-manager)