move lease controller to k8s.io/component-helpers/apimachinery

pkg/controlplane/BUILD

@@ -128,7 +128,7 @@ go_library(
         "//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes/typed/discovery/v1beta1:go_default_library",
         "//staging/src/k8s.io/client-go/rest:go_default_library",
-        "//staging/src/k8s.io/component-helpers/lease:go_default_library",
+        "//staging/src/k8s.io/component-helpers/apimachinery/lease:go_default_library",
         "//vendor/k8s.io/klog/v2:go_default_library",
         "//vendor/k8s.io/utils/integer:go_default_library",
         "//vendor/k8s.io/utils/net:go_default_library",

pkg/controlplane/instance.go

@@ -81,7 +81,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
 	discoveryclient "k8s.io/client-go/kubernetes/typed/discovery/v1beta1"
-	"k8s.io/component-helpers/lease"
+	"k8s.io/component-helpers/apimachinery/lease"
 	api "k8s.io/kubernetes/pkg/apis/core"
 	"k8s.io/kubernetes/pkg/controlplane/controller/clusterauthenticationtrust"
 	"k8s.io/kubernetes/pkg/controlplane/reconcilers"

pkg/kubelet/BUILD

@@ -140,7 +140,7 @@ go_library(
         "//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library",
         "//staging/src/k8s.io/cloud-provider:go_default_library",
         "//staging/src/k8s.io/cloud-provider/api:go_default_library",
-        "//staging/src/k8s.io/component-helpers/lease:go_default_library",
+        "//staging/src/k8s.io/component-helpers/apimachinery/lease:go_default_library",
         "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library",
         "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library",
         "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library",

pkg/kubelet/kubelet.go

@@ -55,7 +55,7 @@ import (
 	"k8s.io/client-go/util/certificate"
 	"k8s.io/client-go/util/flowcontrol"
 	cloudprovider "k8s.io/cloud-provider"
-	"k8s.io/component-helpers/lease"
+	"k8s.io/component-helpers/apimachinery/lease"
 	internalapi "k8s.io/cri-api/pkg/apis"
 	"k8s.io/klog/v2"
 	pluginwatcherapi "k8s.io/kubelet/pkg/apis/pluginregistration/v1"

staging/src/k8s.io/component-helpers/BUILD

@@ -9,9 +9,9 @@ filegroup(
     name = "all-srcs",
     srcs = [
         ":package-srcs",
+        "//staging/src/k8s.io/component-helpers/apimachinery/lease:all-srcs",
         "//staging/src/k8s.io/component-helpers/auth/rbac/reconciliation:all-srcs",
         "//staging/src/k8s.io/component-helpers/auth/rbac/validation:all-srcs",
-        "//staging/src/k8s.io/component-helpers/lease:all-srcs",
         "//staging/src/k8s.io/component-helpers/scheduling/corev1:all-srcs",
     ],
     tags = ["automanaged"],

staging/src/k8s.io/component-helpers/apimachinery/OWNERS

@@ -0,0 +1,8 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+approvers:
+- sig-api-machinery-api-approvers
+reviewers:
+- sig-api-machinery-api-reviewers
+labels:
+- sig/api-machinery

staging/src/k8s.io/component-helpers/apimachinery/lease/BUILD

@@ -3,8 +3,8 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
 go_library(
     name = "go_default_library",
     srcs = ["controller.go"],
-    importmap = "k8s.io/kubernetes/vendor/k8s.io/component-helpers/lease",
-    importpath = "k8s.io/component-helpers/lease",
+    importmap = "k8s.io/kubernetes/vendor/k8s.io/component-helpers/apimachinery/lease",
+    importpath = "k8s.io/component-helpers/apimachinery/lease",
     visibility = ["//visibility:public"],
     deps = [
         "//staging/src/k8s.io/api/coordination/v1:go_default_library",

vendor/modules.txt

@@ -2226,9 +2226,9 @@ k8s.io/component-base/version/verflag
 # k8s.io/component-helpers v0.0.0 => ./staging/src/k8s.io/component-helpers
 ## explicit
 # k8s.io/component-helpers => ./staging/src/k8s.io/component-helpers
+k8s.io/component-helpers/apimachinery/lease
 k8s.io/component-helpers/auth/rbac/reconciliation
 k8s.io/component-helpers/auth/rbac/validation
-k8s.io/component-helpers/lease
 k8s.io/component-helpers/scheduling/corev1
 k8s.io/component-helpers/scheduling/corev1/nodeaffinity
 # k8s.io/controller-manager v0.0.0 => ./staging/src/k8s.io/controller-manager