github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

use common controller interface in KCM.

Browse Source
This commit is contained in:
Jiahui Feng
2021-08-20 14:54:32 -07:00
parent cd80d70c3d
commit 8f5771d243
13 changed files with 87 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/kube-controller-manager/app/certificates.go
View File

@@ -22,8 +22,8 @@ package app
import (
"fmt"
"net/http"
"k8s.io/controller-manager/controller"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/controller/certificates/approver"
"k8s.io/kubernetes/pkg/controller/certificates/cleaner"
@@ -32,7 +32,7 @@ import (
csrsigningconfig "k8s.io/kubernetes/pkg/controller/certificates/signer/config"
)
func startCSRSigningController(ctx ControllerContext) (http.Handler, bool, error) {
func startCSRSigningController(ctx ControllerContext) (controller.Interface, bool, error) {
missingSingleSigningFile := ctx.ComponentConfig.CSRSigningController.ClusterSigningCertFile == "" || ctx.ComponentConfig.CSRSigningController.ClusterSigningKeyFile == ""
if missingSingleSigningFile && !anySpecificFilesSet(ctx.ComponentConfig.CSRSigningController) {
klog.V(2).Info("skipping CSR signer controller because no csr cert/key was specified")
@@ -147,7 +147,7 @@ func getLegacyUnknownSignerFiles(config csrsigningconfig.CSRSigningControllerCon
return config.ClusterSigningCertFile, config.ClusterSigningKeyFile
}
func startCSRApprovingController(ctx ControllerContext) (http.Handler, bool, error) {
func startCSRApprovingController(ctx ControllerContext) (controller.Interface, bool, error) {
approver := approver.NewCSRApprovingController(
ctx.ClientBuilder.ClientOrDie("certificate-controller"),
ctx.InformerFactory.Certificates().V1().CertificateSigningRequests(),
@@ -157,7 +157,7 @@ func startCSRApprovingController(ctx ControllerContext) (http.Handler, bool, err
return nil, true, nil
}
func startCSRCleanerController(ctx ControllerContext) (http.Handler, bool, error) {
func startCSRCleanerController(ctx ControllerContext) (controller.Interface, bool, error) {
cleaner := cleaner.NewCSRCleanerController(
ctx.ClientBuilder.ClientOrDie("certificate-controller").CertificatesV1().CertificateSigningRequests(),
ctx.InformerFactory.Certificates().V1().CertificateSigningRequests(),
@@ -166,7 +166,7 @@ func startCSRCleanerController(ctx ControllerContext) (http.Handler, bool, error
return nil, true, nil
}
func startRootCACertPublisher(ctx ControllerContext) (http.Handler, bool, error) {
func startRootCACertPublisher(ctx ControllerContext) (controller.Interface, bool, error) {
var (
rootCA []byte
err error