Skip to content

Commit 6d4a19b

Browse files
andrewsykimandrewsykim
committed
move pkg/controller/cloud/node_controller.go to k8s.io/cloud-provider/controllers/node for easier external consumption
Signed-off-by: Andrew Sy Kim <[email protected]>
1 parent 99d9dda commit 6d4a19b

File tree

8 files changed

+70
-16
lines changed

8 files changed

+70
-16
lines changed

‎cmd/cloud-controller-manager/app/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ go_library(
2222
"//staging/src/k8s.io/client-go/tools/leaderelection:go_default_library",
2323
"//staging/src/k8s.io/client-go/tools/leaderelection/resourcelock:go_default_library",
2424
"//staging/src/k8s.io/cloud-provider:go_default_library",
25+
"//staging/src/k8s.io/cloud-provider/controllers/node:go_default_library",
2526
"//staging/src/k8s.io/cloud-provider/controllers/route:go_default_library",
2627
"//staging/src/k8s.io/cloud-provider/controllers/service:go_default_library",
2728
"//staging/src/k8s.io/component-base/cli/flag:go_default_library",

‎cmd/cloud-controller-manager/app/core.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"strings"
2828

2929
cloudprovider "k8s.io/cloud-provider"
30+
cloudnodecontroller "k8s.io/cloud-provider/controllers/node"
3031
routecontroller "k8s.io/cloud-provider/controllers/route"
3132
servicecontroller "k8s.io/cloud-provider/controllers/service"
3233
"k8s.io/klog/v2"
@@ -45,7 +46,7 @@ const (
4546

4647
func startCloudNodeController(ctx *cloudcontrollerconfig.CompletedConfig, cloud cloudprovider.Interface, stopCh <-chan struct{}) (http.Handler, bool, error) {
4748
// Start the CloudNodeController
48-
nodeController, err := cloudcontrollers.NewCloudNodeController(
49+
nodeController, err := cloudnodecontroller.NewCloudNodeController(
4950
ctx.SharedInformers.Core().V1().Nodes(),
5051
// cloud node controller uses existing cluster role from node-controller
5152
ctx.ClientBuilder.ClientOrDie("node-controller"),

‎hack/.golint_failures‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@ staging/src/k8s.io/client-go/util/retry
423423
staging/src/k8s.io/client-go/util/testing
424424
staging/src/k8s.io/client-go/util/workqueue
425425
staging/src/k8s.io/cloud-provider
426+
staging/src/k8s.io/cloud-provider/controllers/node
426427
staging/src/k8s.io/cloud-provider/controllers/route
427428
staging/src/k8s.io/code-generator/cmd/client-gen/args
428429
staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake

‎pkg/controller/cloud/BUILD‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,11 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
22

33
go_library(
44
name = "go_default_library",
5-
srcs = [
6-
"node_controller.go",
7-
"node_lifecycle_controller.go",
8-
],
5+
srcs = ["node_lifecycle_controller.go"],
96
importpath = "k8s.io/kubernetes/pkg/controller/cloud",
107
visibility = ["//visibility:public"],
118
deps = [
129
"//staging/src/k8s.io/api/core/v1:go_default_library",
13-
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
1410
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
1511
"//staging/src/k8s.io/apimachinery/pkg/labels:go_default_library",
1612
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
@@ -21,9 +17,7 @@ go_library(
2117
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
2218
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
2319
"//staging/src/k8s.io/client-go/listers/core/v1:go_default_library",
24-
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
2520
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
26-
"//staging/src/k8s.io/client-go/util/retry:go_default_library",
2721
"//staging/src/k8s.io/cloud-provider:go_default_library",
2822
"//staging/src/k8s.io/cloud-provider/api:go_default_library",
2923
"//staging/src/k8s.io/cloud-provider/node/helpers:go_default_library",
@@ -33,10 +27,7 @@ go_library(
3327

3428
go_test(
3529
name = "go_default_test",
36-
srcs = [
37-
"node_controller_test.go",
38-
"node_lifecycle_controller_test.go",
39-
],
30+
srcs = ["node_lifecycle_controller_test.go"],
4031
embed = [":go_default_library"],
4132
deps = [
4233
"//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -48,11 +39,7 @@ go_test(
4839
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
4940
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
5041
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
51-
"//staging/src/k8s.io/cloud-provider:go_default_library",
52-
"//staging/src/k8s.io/cloud-provider/api:go_default_library",
5342
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
54-
"//vendor/github.com/google/go-cmp/cmp:go_default_library",
55-
"//vendor/github.com/stretchr/testify/assert:go_default_library",
5643
"//vendor/k8s.io/klog/v2:go_default_library",
5744
],
5845
)

‎staging/src/k8s.io/cloud-provider/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ filegroup(
3737
srcs = [
3838
":package-srcs",
3939
"//staging/src/k8s.io/cloud-provider/api:all-srcs",
40+
"//staging/src/k8s.io/cloud-provider/controllers/node:all-srcs",
4041
"//staging/src/k8s.io/cloud-provider/controllers/route:all-srcs",
4142
"//staging/src/k8s.io/cloud-provider/controllers/service:all-srcs",
4243
"//staging/src/k8s.io/cloud-provider/fake:all-srcs",

‎staging/src/k8s.io/cloud-provider/controllers/node/BUILD‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
2+
3+
go_library(
4+
name = "go_default_library",
5+
srcs = ["node_controller.go"],
6+
importmap = "k8s.io/kubernetes/vendor/k8s.io/cloud-provider/controllers/node",
7+
importpath = "k8s.io/cloud-provider/controllers/node",
8+
visibility = ["//visibility:public"],
9+
deps = [
10+
"//staging/src/k8s.io/api/core/v1:go_default_library",
11+
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
12+
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
13+
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
14+
"//staging/src/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
15+
"//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
16+
"//staging/src/k8s.io/client-go/informers/core/v1:go_default_library",
17+
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
18+
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
19+
"//staging/src/k8s.io/client-go/kubernetes/typed/core/v1:go_default_library",
20+
"//staging/src/k8s.io/client-go/tools/cache:go_default_library",
21+
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
22+
"//staging/src/k8s.io/client-go/util/retry:go_default_library",
23+
"//staging/src/k8s.io/cloud-provider:go_default_library",
24+
"//staging/src/k8s.io/cloud-provider/api:go_default_library",
25+
"//staging/src/k8s.io/cloud-provider/node/helpers:go_default_library",
26+
"//vendor/k8s.io/klog/v2:go_default_library",
27+
],
28+
)
29+
30+
go_test(
31+
name = "go_default_test",
32+
srcs = ["node_controller_test.go"],
33+
embed = [":go_default_library"],
34+
deps = [
35+
"//staging/src/k8s.io/api/core/v1:go_default_library",
36+
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
37+
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
38+
"//staging/src/k8s.io/client-go/informers:go_default_library",
39+
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
40+
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
41+
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
42+
"//staging/src/k8s.io/cloud-provider:go_default_library",
43+
"//staging/src/k8s.io/cloud-provider/api:go_default_library",
44+
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
45+
"//vendor/github.com/google/go-cmp/cmp:go_default_library",
46+
"//vendor/github.com/stretchr/testify/assert:go_default_library",
47+
"//vendor/k8s.io/klog/v2:go_default_library",
48+
],
49+
)
50+
51+
filegroup(
52+
name = "package-srcs",
53+
srcs = glob(["**"]),
54+
tags = ["automanaged"],
55+
visibility = ["//visibility:private"],
56+
)
57+
58+
filegroup(
59+
name = "all-srcs",
60+
srcs = [":package-srcs"],
61+
tags = ["automanaged"],
62+
visibility = ["//visibility:public"],
63+
)

‎pkg/controller/cloud/node_controller.go‎ renamed to ‎staging/src/k8s.io/cloud-provider/controllers/node/node_controller.go‎

File renamed without changes.

‎pkg/controller/cloud/node_controller_test.go‎ renamed to ‎staging/src/k8s.io/cloud-provider/controllers/node/node_controller_test.go‎

File renamed without changes.

0 commit comments

Comments
 (0)