Merge branch 'develop-tmp-zhuling' into 'develop-tmp'

Make periodic NodeStatus updates cheaper cherry-pick master, create lease api, kubernetes#64246 master, node lifecycle controller, kubernetes#69241 kubelet, kubernetes#66257 See merge request !184866
mars1024 · Dec 5, 2018 · 33cf2d4 · 33cf2d4
2 parents 8e5dbec + 0eeafb4
commit 33cf2d4
Show file tree

Hide file tree

Showing 25 changed files with 1,973 additions and 249 deletions.
diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json
diff --git a/api/swagger-spec/coordination.k8s.io_v1beta1.json b/api/swagger-spec/coordination.k8s.io_v1beta1.json
diff --git a/cmd/kube-controller-manager/app/BUILD b/cmd/kube-controller-manager/app/BUILD
@@ -28,6 +28,7 @@ go_library(
         "//pkg/apis/autoscaling/install:go_default_library",
         "//pkg/apis/batch/install:go_default_library",
         "//pkg/apis/certificates/install:go_default_library",
+        "//pkg/apis/componentconfig:go_default_library",
         "//pkg/apis/coordination/install:go_default_library",
         "//pkg/apis/core/install:go_default_library",
         "//pkg/apis/events/install:go_default_library",

diff --git a/cmd/kube-controller-manager/app/core.go b/cmd/kube-controller-manager/app/core.go
@@ -121,6 +121,7 @@ func startNodeIpamController(ctx ControllerContext) (http.Handler, bool, error)
 
 func startNodeLifecycleController(ctx ControllerContext) (http.Handler, bool, error) {
 	lifecycleController, err := lifecyclecontroller.NewNodeLifecycleController(
+		ctx.InformerFactory.Coordination().V1beta1().Leases(),
 		ctx.InformerFactory.Core().V1().Pods(),
 		ctx.InformerFactory.Core().V1().Nodes(),
 		ctx.InformerFactory.Extensions().V1beta1().DaemonSets(),

diff --git a/docs/api-reference/coordination.k8s.io/v1beta1/definitions.html b/docs/api-reference/coordination.k8s.io/v1beta1/definitions.html