github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #77467 from dixudx/csrsigning_controller_warning

Browse Source 
add warning logs for csr controllers
This commit is contained in:
Kubernetes Prow Robot 2019-07-09 10:12:16 -07:00 committed by GitHub
commit 4f917a06a9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,9 @@ import (
) )
func startCSRSigningController(ctx ControllerContext) (http.Handler, bool, error) { func startCSRSigningController(ctx ControllerContext) (http.Handler, bool, error) {
if !ctx.AvailableResources[schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1beta1", Resource: "certificatesigningrequests"}] { gvr := schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1beta1", Resource: "certificatesigningrequests"}
if !ctx.AvailableResources[gvr] {
klog.Warningf("Resource %s is not available now", gvr.String())
return nil, false, nil return nil, false, nil
} }
if ctx.ComponentConfig.CSRSigningController.ClusterSigningCertFile == "" || ctx.ComponentConfig.CSRSigningController.ClusterSigningKeyFile == "" { if ctx.ComponentConfig.CSRSigningController.ClusterSigningCertFile == "" || ctx.ComponentConfig.CSRSigningController.ClusterSigningKeyFile == "" {
@ -102,7 +104,9 @@ func startCSRSigningController(ctx ControllerContext) (http.Handler, bool, error
} }
func startCSRApprovingController(ctx ControllerContext) (http.Handler, bool, error) { func startCSRApprovingController(ctx ControllerContext) (http.Handler, bool, error) {
if !ctx.AvailableResources[schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1beta1", Resource: "certificatesigningrequests"}] { gvr := schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1beta1", Resource: "certificatesigningrequests"}
if !ctx.AvailableResources[gvr] {
klog.Warningf("Resource %s is not available now", gvr.String())
return nil, false, nil return nil, false, nil
} }