github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92018 from liggitt/csr-controller-v1

Browse Source 
Check for v1 CSR API in kube-controller-manager
This commit is contained in:
Kubernetes Prow Robot 2020-06-11 00:53:19 -07:00 committed by GitHub
commit a8e43038a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ import (
)
func startCSRSigningController(ctx ControllerContext) (http.Handler, bool, error) {
gvr := schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1beta1", Resource: "certificatesigningrequests"}
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
@ -129,7 +129,7 @@ func getKubeletServingSignerFiles(config csrsigningconfig.CSRSigningControllerCo
}
func startCSRApprovingController(ctx ControllerContext) (http.Handler, bool, error) {
gvr := schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1beta1", Resource: "certificatesigningrequests"}
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