github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Use v1 subjectaccessreview API in controller-manager CSR approver

Browse Source
This commit is contained in:
Jordan Liggitt 2020-01-13 15:55:52 -05:00
parent 36e40fb850
commit 054e3846fc
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/certificates/approver/BUILD
View File

@ -12,7 +12,7 @@ go_test(
embed = [":go_default_library"], embed = [":go_default_library"],
deps = [ deps = [
"//pkg/apis/certificates/v1beta1:go_default_library", "//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/api/certificates/v1beta1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
@ -28,7 +28,7 @@ go_library(
deps = [ deps = [
"//pkg/apis/certificates/v1beta1:go_default_library", "//pkg/apis/certificates/v1beta1:go_default_library",
"//pkg/controller/certificates: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/api/certificates/v1beta1:go_default_library",
"//staging/src/k8s.io/client-go/informers/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", "//staging/src/k8s.io/client-go/kubernetes:go_default_library",

4
pkg/controller/certificates/approver/sarapprove.go
View File

@ -23,7 +23,7 @@ import (
"reflect" "reflect"
"strings" "strings"
authorization "k8s.io/api/authorization/v1beta1" authorization "k8s.io/api/authorization/v1"
capi "k8s.io/api/certificates/v1beta1" capi "k8s.io/api/certificates/v1beta1"
certificatesinformers "k8s.io/client-go/informers/certificates/v1beta1" certificatesinformers "k8s.io/client-go/informers/certificates/v1beta1"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
@ -129,7 +129,7 @@ func (a *sarApprover) authorize(csr *capi.CertificateSigningRequest, rattrs auth
ResourceAttributes: &rattrs, ResourceAttributes: &rattrs,
}, },
} }
sar, err := a.client.AuthorizationV1beta1().SubjectAccessReviews().Create(sar) sar, err := a.client.AuthorizationV1().SubjectAccessReviews().Create(sar)
if err != nil { if err != nil {
return false, err return false, err
} }

2
pkg/controller/certificates/approver/sarapprove_test.go
View File

@ -27,7 +27,7 @@ import (
"net" "net"
"testing" "testing"
authorization "k8s.io/api/authorization/v1beta1" authorization "k8s.io/api/authorization/v1"
capi "k8s.io/api/certificates/v1beta1" capi "k8s.io/api/certificates/v1beta1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"