github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Delete AvailableResources judgment for GA features

Browse Source
This commit is contained in:
chenyw1990
2021-05-10 10:33:28 +08:00
parent e6136c0303
commit ade167e53a
3 changed files with 0 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,7 +24,6 @@ import (
"fmt"
"net/http"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/controller/certificates/approver"
"k8s.io/kubernetes/pkg/controller/certificates/cleaner"
@@ -34,11 +33,6 @@ import (
)
func startCSRSigningController(ctx ControllerContext) (http.Handler, bool, error) {
gvr := schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1", Resource: "certificatesigningrequests"}
if !ctx.AvailableResources[gvr] {
klog.Warningf("Resource %s is not available now", gvr.String())
return nil, false, nil
}
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")
@@ -154,12 +148,6 @@ func getLegacyUnknownSignerFiles(config csrsigningconfig.CSRSigningControllerCon
}
func startCSRApprovingController(ctx ControllerContext) (http.Handler, bool, error) {
gvr := schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1", Resource: "certificatesigningrequests"}
if !ctx.AvailableResources[gvr] {
klog.Warningf("Resource %s is not available now", gvr.String())
return nil, false, nil
}
approver := approver.NewCSRApprovingController(
ctx.ClientBuilder.ClientOrDie("certificate-controller"),
ctx.InformerFactory.Certificates().V1().CertificateSigningRequests(),