Skip to content

Commit 9173a5f

Browse files
authored
Merge pull request kubernetes#87164 from liggitt/sar-approver-v1
Use v1 subjectaccessreview API in controller-manager CSR approver
2 parents b2c61fa + 054e384 commit 9173a5f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

pkg/controller/certificates/approver/BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ go_test(
1212
embed = [":go_default_library"],
1313
deps = [
1414
"//pkg/apis/certificates/v1beta1:go_default_library",
15-
"//staging/src/k8s.io/api/authorization/v1beta1:go_default_library",
15+
"//staging/src/k8s.io/api/authorization/v1:go_default_library",
1616
"//staging/src/k8s.io/api/certificates/v1beta1:go_default_library",
1717
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
1818
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
@@ -28,7 +28,7 @@ go_library(
2828
deps = [
2929
"//pkg/apis/certificates/v1beta1:go_default_library",
3030
"//pkg/controller/certificates:go_default_library",
31-
"//staging/src/k8s.io/api/authorization/v1beta1:go_default_library",
31+
"//staging/src/k8s.io/api/authorization/v1:go_default_library",
3232
"//staging/src/k8s.io/api/certificates/v1beta1:go_default_library",
3333
"//staging/src/k8s.io/client-go/informers/certificates/v1beta1:go_default_library",
3434
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",

pkg/controller/certificates/approver/sarapprove.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"reflect"
2424
"strings"
2525

26-
authorization "k8s.io/api/authorization/v1beta1"
26+
authorization "k8s.io/api/authorization/v1"
2727
capi "k8s.io/api/certificates/v1beta1"
2828
certificatesinformers "k8s.io/client-go/informers/certificates/v1beta1"
2929
clientset "k8s.io/client-go/kubernetes"
@@ -129,7 +129,7 @@ func (a *sarApprover) authorize(csr *capi.CertificateSigningRequest, rattrs auth
129129
ResourceAttributes: &rattrs,
130130
},
131131
}
132-
sar, err := a.client.AuthorizationV1beta1().SubjectAccessReviews().Create(sar)
132+
sar, err := a.client.AuthorizationV1().SubjectAccessReviews().Create(sar)
133133
if err != nil {
134134
return false, err
135135
}

pkg/controller/certificates/approver/sarapprove_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"net"
2828
"testing"
2929

30-
authorization "k8s.io/api/authorization/v1beta1"
30+
authorization "k8s.io/api/authorization/v1"
3131
capi "k8s.io/api/certificates/v1beta1"
3232
"k8s.io/apimachinery/pkg/runtime"
3333
"k8s.io/apimachinery/pkg/runtime/schema"

0 commit comments

Comments
 (0)