Skip to content

Commit a8e4303

Browse files
authored
Merge pull request kubernetes#92018 from liggitt/csr-controller-v1
Check for v1 CSR API in kube-controller-manager
2 parents 257d11d + 6183bcf commit a8e4303

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

cmd/kube-controller-manager/app/certificates.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939
)
4040

4141
func startCSRSigningController(ctx ControllerContext) (http.Handler, bool, error) {
42-
gvr := schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1beta1", Resource: "certificatesigningrequests"}
42+
gvr := schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1", Resource: "certificatesigningrequests"}
4343
if !ctx.AvailableResources[gvr] {
4444
klog.Warningf("Resource %s is not available now", gvr.String())
4545
return nil, false, nil
@@ -129,7 +129,7 @@ func getKubeletServingSignerFiles(config csrsigningconfig.CSRSigningControllerCo
129129
}
130130

131131
func startCSRApprovingController(ctx ControllerContext) (http.Handler, bool, error) {
132-
gvr := schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1beta1", Resource: "certificatesigningrequests"}
132+
gvr := schema.GroupVersionResource{Group: "certificates.k8s.io", Version: "v1", Resource: "certificatesigningrequests"}
133133
if !ctx.AvailableResources[gvr] {
134134
klog.Warningf("Resource %s is not available now", gvr.String())
135135
return nil, false, nil

0 commit comments

Comments
 (0)