diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/BUILD b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/BUILD index fcdd401f2fd..a3af80408ff 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/BUILD +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/BUILD @@ -36,7 +36,7 @@ go_test( "//pkg/api/v1:go_default_library", "//pkg/apis/rbac:go_default_library", "//pkg/apis/rbac/install:go_default_library", - "//pkg/apis/rbac/v1alpha1:go_default_library", + "//pkg/apis/rbac/v1beta1:go_default_library", "//pkg/registry/rbac/validation:go_default_library", "//plugin/pkg/auth/authorizer/rbac/bootstrappolicy:go_default_library", "//vendor:github.com/ghodss/yaml", diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy_test.go b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy_test.go index 216069aa421..800a6884d75 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy_test.go +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/policy_test.go @@ -34,7 +34,7 @@ import ( "k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/apis/rbac" _ "k8s.io/kubernetes/pkg/apis/rbac/install" - rbacv1alpha1 "k8s.io/kubernetes/pkg/apis/rbac/v1alpha1" + rbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" rbacregistryvalidation "k8s.io/kubernetes/pkg/registry/rbac/validation" "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac/bootstrappolicy" ) @@ -222,11 +222,11 @@ func testObjects(t *testing.T, list *api.List, fixtureFilename string) { t.Fatal(err) } - if err := runtime.EncodeList(api.Codecs.LegacyCodec(v1.SchemeGroupVersion, rbacv1alpha1.SchemeGroupVersion), list.Items); err != nil { + if err := runtime.EncodeList(api.Codecs.LegacyCodec(v1.SchemeGroupVersion, rbacv1beta1.SchemeGroupVersion), list.Items); err != nil { t.Fatal(err) } - jsonData, err := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion, rbacv1alpha1.SchemeGroupVersion), list) + jsonData, err := runtime.Encode(api.Codecs.LegacyCodec(v1.SchemeGroupVersion, rbacv1beta1.SchemeGroupVersion), list) if err != nil { t.Fatal(err) } diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-role-bindings.yaml b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-role-bindings.yaml index bf474f541eb..3f0700a11a1 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-role-bindings.yaml +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-role-bindings.yaml @@ -1,6 +1,6 @@ apiVersion: v1 items: -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -14,7 +14,7 @@ items: subjects: - kind: Group name: system:masters -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -30,7 +30,7 @@ items: name: system:authenticated - kind: Group name: system:unauthenticated -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -46,7 +46,7 @@ items: name: system:authenticated - kind: Group name: system:unauthenticated -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -60,7 +60,7 @@ items: subjects: - kind: User name: system:kube-controller-manager -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -74,7 +74,7 @@ items: subjects: - kind: Group name: system:nodes -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml index cbb258ab1de..440b02d3654 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/cluster-roles.yaml @@ -1,6 +1,6 @@ apiVersion: v1 items: -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -157,7 +157,7 @@ items: - patch - update - watch -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -175,7 +175,7 @@ items: - '*' verbs: - '*' -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -312,7 +312,7 @@ items: - patch - update - watch -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -332,7 +332,7 @@ items: - subjectaccessreviews verbs: - create -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -346,7 +346,7 @@ items: - selfsubjectaccessreviews verbs: - create -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -364,7 +364,7 @@ items: - /version verbs: - get -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -383,7 +383,7 @@ items: - get - list - watch -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -400,7 +400,7 @@ items: - get - list - watch -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -476,7 +476,7 @@ items: verbs: - list - watch -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -571,7 +571,7 @@ items: - endpoints verbs: - get -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -594,7 +594,7 @@ items: - get - list - watch -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -622,7 +622,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -652,7 +652,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-role-bindings.yaml b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-role-bindings.yaml index c26ee08e794..759c66215cf 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-role-bindings.yaml +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-role-bindings.yaml @@ -1,6 +1,6 @@ apiVersion: v1 items: -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -15,7 +15,7 @@ items: - kind: ServiceAccount name: attachdetach-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -30,7 +30,7 @@ items: - kind: ServiceAccount name: certificate-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -45,7 +45,7 @@ items: - kind: ServiceAccount name: cronjob-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -60,7 +60,7 @@ items: - kind: ServiceAccount name: daemon-set-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -75,7 +75,7 @@ items: - kind: ServiceAccount name: deployment-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -90,7 +90,7 @@ items: - kind: ServiceAccount name: disruption-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -105,7 +105,7 @@ items: - kind: ServiceAccount name: endpoint-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -120,7 +120,7 @@ items: - kind: ServiceAccount name: generic-garbage-collector namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -135,7 +135,7 @@ items: - kind: ServiceAccount name: horizontal-pod-autoscaler namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -150,7 +150,7 @@ items: - kind: ServiceAccount name: job-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -165,7 +165,7 @@ items: - kind: ServiceAccount name: namespace-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -180,7 +180,7 @@ items: - kind: ServiceAccount name: node-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -195,7 +195,7 @@ items: - kind: ServiceAccount name: persistent-volume-binder namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -210,7 +210,7 @@ items: - kind: ServiceAccount name: pod-garbage-collector namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -225,7 +225,7 @@ items: - kind: ServiceAccount name: replicaset-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -240,7 +240,7 @@ items: - kind: ServiceAccount name: replication-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -255,7 +255,7 @@ items: - kind: ServiceAccount name: resourcequota-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -270,7 +270,7 @@ items: - kind: ServiceAccount name: route-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -285,7 +285,7 @@ items: - kind: ServiceAccount name: service-account-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null @@ -300,7 +300,7 @@ items: - kind: ServiceAccount name: service-controller namespace: kube-system -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRoleBinding metadata: creationTimestamp: null diff --git a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml index c322eb53819..53696fadad9 100644 --- a/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml +++ b/plugin/pkg/auth/authorizer/rbac/bootstrappolicy/testdata/controller-roles.yaml @@ -1,6 +1,6 @@ apiVersion: v1 items: -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -46,7 +46,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -77,7 +77,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -126,7 +126,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -178,7 +178,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -230,7 +230,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -292,7 +292,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -333,7 +333,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -360,7 +360,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -429,7 +429,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -469,7 +469,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -502,7 +502,7 @@ items: - deletecollection - get - list -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -546,7 +546,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -633,7 +633,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -655,7 +655,7 @@ items: - nodes verbs: - list -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -696,7 +696,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -737,7 +737,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -766,7 +766,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -795,7 +795,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -817,7 +817,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null @@ -854,7 +854,7 @@ items: - create - patch - update -- apiVersion: rbac.authorization.k8s.io/v1alpha1 +- apiVersion: rbac.authorization.k8s.io/v1beta1 kind: ClusterRole metadata: creationTimestamp: null