Commit 0a568305 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #41383 from liggitt/v1beta1-cleanup

Automatic merge from submit-queue Update rbac data to v1beta1 Update RBAC fixtures to v1beta1
parents a57967f4 9e6a3496
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# TODO cjcullen should figure out how wants to manage his upgrade # TODO cjcullen should figure out how wants to manage his upgrade
# this will only hold the e2e tests until we get an authorizer # this will only hold the e2e tests until we get an authorizer
# which authorizes particular nodes # which authorizes particular nodes
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: kubelet-cluster-admin name: kubelet-cluster-admin
...@@ -14,6 +14,6 @@ roleRef: ...@@ -14,6 +14,6 @@ roleRef:
kind: ClusterRole kind: ClusterRole
name: system:node name: system:node
subjects: subjects:
- apiVersion: rbac/v1alpha1 - apiGroup: rbac.authorization.k8s.io
kind: User kind: User
name: kubelet name: kubelet
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
# the system:serviceaccount:kube-system:default identity. We need to subdivide # the system:serviceaccount:kube-system:default identity. We need to subdivide
# those service accounts, figure out which ones we're going to make bootstrap roles for # those service accounts, figure out which ones we're going to make bootstrap roles for
# and bind those particular roles in the addon yaml itself. This just gets us started # and bind those particular roles in the addon yaml itself. This just gets us started
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: todo-remove-grabbag-cluster-admin name: todo-remove-grabbag-cluster-admin
......
# privilegedPSP gives the privilegedPSP role # privilegedPSP gives the privilegedPSP role
# to the group privileged. # to the group privileged.
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: privileged-psp-users name: privileged-psp-users
subjects: subjects:
- kind: Group - kind: Group
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiGroup: rbac.authorization.k8s.io
name: privileged-psp-users name: privileged-psp-users
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
...@@ -15,16 +15,16 @@ roleRef: ...@@ -15,16 +15,16 @@ roleRef:
--- ---
# restrictedPSP grants the restrictedPSP role to # restrictedPSP grants the restrictedPSP role to
# the groups restricted and privileged. # the groups restricted and privileged.
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: restricted-psp-users name: restricted-psp-users
subjects: subjects:
- kind: Group - kind: Group
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiGroup: rbac.authorization.k8s.io
name: restricted-psp-users name: restricted-psp-users
- kind: Group - kind: Group
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiGroup: rbac.authorization.k8s.io
name: privileged-psp-users name: privileged-psp-users
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
...@@ -32,16 +32,16 @@ roleRef: ...@@ -32,16 +32,16 @@ roleRef:
name: restricted-psp-user name: restricted-psp-user
--- ---
# edit grants edit role to system:authenticated. # edit grants edit role to system:authenticated.
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: edit name: edit
subjects: subjects:
- kind: Group - kind: Group
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiGroup: rbac.authorization.k8s.io
name: privileged-psp-users name: privileged-psp-users
- kind: Group - kind: Group
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiGroup: rbac.authorization.k8s.io
name: restricted-psp-users name: restricted-psp-users
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
......
# restrictedPSP grants access to use # restrictedPSP grants access to use
# the restricted PSP. # the restricted PSP.
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: restricted-psp-user name: restricted-psp-user
...@@ -16,7 +16,7 @@ rules: ...@@ -16,7 +16,7 @@ rules:
--- ---
# privilegedPSP grants access to use the privileged # privilegedPSP grants access to use the privileged
# PSP. # PSP.
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
name: privileged-psp-user name: privileged-psp-user
......
# This is the role binding for the kubemark heapster. # This is the role binding for the kubemark heapster.
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: heapster-view-binding name: heapster-view-binding
...@@ -10,6 +10,6 @@ roleRef: ...@@ -10,6 +10,6 @@ roleRef:
kind: ClusterRole kind: ClusterRole
name: system:heapster name: system:heapster
subjects: subjects:
- apiVersion: rbac/v1alpha1 - apiGroup: rbac.authorization.k8s.io
kind: User kind: User
name: system:heapster name: system:heapster
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# used for listing hollow-nodes in start-kubemark.sh and # used for listing hollow-nodes in start-kubemark.sh and
# send resource creation requests, etc in run-e2e-tests.sh. # send resource creation requests, etc in run-e2e-tests.sh.
# Also useful if you manually want to use local kubectl. # Also useful if you manually want to use local kubectl.
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: kubecfg-cluster-admin name: kubecfg-cluster-admin
...@@ -13,6 +13,6 @@ roleRef: ...@@ -13,6 +13,6 @@ roleRef:
kind: ClusterRole kind: ClusterRole
name: cluster-admin name: cluster-admin
subjects: subjects:
- apiVersion: rbac/v1alpha1 - apiGroup: rbac.authorization.k8s.io
kind: User kind: User
name: kubecfg name: kubecfg
# This is the role binding for the node-problem-detector. # This is the role binding for the node-problem-detector.
apiVersion: rbac.authorization.k8s.io/v1alpha1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding kind: ClusterRoleBinding
metadata: metadata:
name: node-problem-detector-binding name: node-problem-detector-binding
...@@ -10,6 +10,6 @@ roleRef: ...@@ -10,6 +10,6 @@ roleRef:
kind: ClusterRole kind: ClusterRole
name: system:node-problem-detector name: system:node-problem-detector
subjects: subjects:
- apiVersion: rbac/v1alpha1 - apiGroup: rbac.authorization.k8s.io
kind: User kind: User
name: system:node-problem-detector name: system:node-problem-detector
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment