Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move lease controller to k8s.io/component-helpers/apimachinery #96196

Merged
merged 1 commit into from Nov 11, 2020
Merged

Move lease controller to k8s.io/component-helpers/apimachinery #96196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/controlplane/BUILD
View file
Open in desktop
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/controlplane/instance.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/BUILD
View file
Open in desktop
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/kubelet.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion staging/src/k8s.io/component-helpers/BUILD
View file
Open in desktop
Expand Up @@ -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"],
Expand Down
8 changes: 8 additions & 0 deletions staging/src/k8s.io/component-helpers/apimachinery/OWNERS
View file
Open in desktop
@@ -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
4 changes: 2 additions & 2 deletions .../src/k8s.io/component-helpers/lease/BUILD → ...omponent-helpers/apimachinery/lease/BUILD
View file
Open in desktop
Expand Up @@ -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",
Expand Down
0 ....io/component-helpers/lease/controller.go → ...-helpers/apimachinery/lease/controller.go
View file
Open in desktop
File renamed without changes.
0 ...omponent-helpers/lease/controller_test.go → ...ers/apimachinery/lease/controller_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Expand Up @@ -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
Expand Down