From 054e3846fc1947c35ed80972f12ddafd945afff7 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Mon, 13 Jan 2020 15:55:52 -0500 Subject: [PATCH] Use v1 subjectaccessreview API in controller-manager CSR approver --- pkg/controller/certificates/approver/BUILD | 4 ++-- pkg/controller/certificates/approver/sarapprove.go | 4 ++-- pkg/controller/certificates/approver/sarapprove_test.go | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/controller/certificates/approver/BUILD b/pkg/controller/certificates/approver/BUILD index 4539b2b424e..a05220dad88 100644 --- a/pkg/controller/certificates/approver/BUILD +++ b/pkg/controller/certificates/approver/BUILD @@ -12,7 +12,7 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/apis/certificates/v1beta1:go_default_library", - "//staging/src/k8s.io/api/authorization/v1beta1:go_default_library", + "//staging/src/k8s.io/api/authorization/v1:go_default_library", "//staging/src/k8s.io/api/certificates/v1beta1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", @@ -28,7 +28,7 @@ go_library( deps = [ "//pkg/apis/certificates/v1beta1:go_default_library", "//pkg/controller/certificates:go_default_library", - "//staging/src/k8s.io/api/authorization/v1beta1:go_default_library", + "//staging/src/k8s.io/api/authorization/v1:go_default_library", "//staging/src/k8s.io/api/certificates/v1beta1:go_default_library", "//staging/src/k8s.io/client-go/informers/certificates/v1beta1:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library", diff --git a/pkg/controller/certificates/approver/sarapprove.go b/pkg/controller/certificates/approver/sarapprove.go index f07953fab27..4c1d1dc2448 100644 --- a/pkg/controller/certificates/approver/sarapprove.go +++ b/pkg/controller/certificates/approver/sarapprove.go @@ -23,7 +23,7 @@ import ( "reflect" "strings" - authorization "k8s.io/api/authorization/v1beta1" + authorization "k8s.io/api/authorization/v1" capi "k8s.io/api/certificates/v1beta1" certificatesinformers "k8s.io/client-go/informers/certificates/v1beta1" clientset "k8s.io/client-go/kubernetes" @@ -129,7 +129,7 @@ func (a *sarApprover) authorize(csr *capi.CertificateSigningRequest, rattrs auth ResourceAttributes: &rattrs, }, } - sar, err := a.client.AuthorizationV1beta1().SubjectAccessReviews().Create(sar) + sar, err := a.client.AuthorizationV1().SubjectAccessReviews().Create(sar) if err != nil { return false, err } diff --git a/pkg/controller/certificates/approver/sarapprove_test.go b/pkg/controller/certificates/approver/sarapprove_test.go index 3f9092bd489..786bb731adb 100644 --- a/pkg/controller/certificates/approver/sarapprove_test.go +++ b/pkg/controller/certificates/approver/sarapprove_test.go @@ -27,7 +27,7 @@ import ( "net" "testing" - authorization "k8s.io/api/authorization/v1beta1" + authorization "k8s.io/api/authorization/v1" capi "k8s.io/api/certificates/v1beta1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime/schema"