github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #26924 from olegshaldybin/pluralize-subject 

Automatic merge from submit-queue

Rename RBAC 'subject' to 'subjects'.

Rename RBAC subject field

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
pull/6/head
k8s-merge-robot 2016-06-18 14:18:04 -07:00 committed by GitHub
parent 77cf11f4d7 14a60436b2
commit b9dbe98a74
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json
View File

@ -2685,7 +2685,7 @@
"id": "v1alpha1.ClusterRoleBinding",
"description": "ClusterRoleBinding references a ClusterRole, but not contain it. It can reference a ClusterRole in the global namespace, and adds who information via Subject.",
"required": [
"subject",
"subjects",
"roleRef"
],
"properties": {
@ -2701,7 +2701,7 @@
"$ref": "v1.ObjectMeta",
"description": "Standard object's metadata."
},
"subject": {
"subjects": {
"type": "array",
"items": {
"$ref": "v1alpha1.Subject"
@ -3151,7 +3151,7 @@
"id": "v1alpha1.RoleBinding",
"description": "RoleBinding references a role, but does not contain it. It can reference a Role in the same namespace or a ClusterRole in the global namespace. It adds who information via Subjects and namespace information by which namespace it exists in. RoleBindings in a given namespace only have effect in that namespace.",
"required": [
"subject",
"subjects",
"roleRef"
],
"properties": {
@ -3167,7 +3167,7 @@
"$ref": "v1.ObjectMeta",
"description": "Standard object's metadata."
},
"subject": {
"subjects": {
"type": "array",
"items": {
"$ref": "v1alpha1.Subject"

4
pkg/apis/rbac/v1alpha1/generated.proto
View File

@ -46,7 +46,7 @@ message ClusterRoleBinding {
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
// Subjects holds references to the objects the role applies to.
repeated Subject subject = 2;
repeated Subject subjects = 2;
// RoleRef can only reference a ClusterRole in the global namespace.
// If the RoleRef cannot be resolved, the Authorizer must return an error.
@ -114,7 +114,7 @@ message RoleBinding {
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
// Subjects holds references to the objects the role applies to.
repeated Subject subject = 2;
repeated Subject subjects = 2;
// RoleRef can reference a Role in the current namespace or a ClusterRole in the global namespace.
// If the RoleRef cannot be resolved, the Authorizer must return an error.

8
pkg/apis/rbac/v1alpha1/types.generated.go
View File

@ -1270,7 +1270,7 @@ func (x *RoleBinding) CodecEncodeSelf(e *codec1978.Encoder) {
}
} else {
z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("subject"))
r.EncodeString(codecSelferC_UTF81234, string("subjects"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
if x.Subjects == nil {
r.EncodeNil()
@ -1412,7 +1412,7 @@ func (x *RoleBinding) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
yyv4 := &x.ObjectMeta
yyv4.CodecDecodeSelf(d)
}
case "subject":
case "subjects":
if r.TryDecodeAsNil() {
x.Subjects = nil
} else {
@ -2633,7 +2633,7 @@ func (x *ClusterRoleBinding) CodecEncodeSelf(e *codec1978.Encoder) {
}
} else {
z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("subject"))
r.EncodeString(codecSelferC_UTF81234, string("subjects"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
if x.Subjects == nil {
r.EncodeNil()
@ -2775,7 +2775,7 @@ func (x *ClusterRoleBinding) codecDecodeSelfFromMap(l int, d *codec1978.Decoder)
yyv4 := &x.ObjectMeta
yyv4.CodecDecodeSelf(d)
}
case "subject":
case "subjects":
if r.TryDecodeAsNil() {
x.Subjects = nil
} else {

4
pkg/apis/rbac/v1alpha1/types.go
View File

@ -86,7 +86,7 @@ type RoleBinding struct {
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Subjects holds references to the objects the role applies to.
Subjects []Subject `json:"subject" protobuf:"bytes,2,rep,name=subjects"`
Subjects []Subject `json:"subjects" protobuf:"bytes,2,rep,name=subjects"`
// RoleRef can reference a Role in the current namespace or a ClusterRole in the global namespace.
// If the RoleRef cannot be resolved, the Authorizer must return an error.
@ -135,7 +135,7 @@ type ClusterRoleBinding struct {
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Subjects holds references to the objects the role applies to.
Subjects []Subject `json:"subject" protobuf:"bytes,2,rep,name=subjects"`
Subjects []Subject `json:"subjects" protobuf:"bytes,2,rep,name=subjects"`
// RoleRef can only reference a ClusterRole in the global namespace.
// If the RoleRef cannot be resolved, the Authorizer must return an error.

4
pkg/apis/rbac/v1alpha1/types_swagger_doc_generated.go
View File

@ -40,7 +40,7 @@ func (ClusterRole) SwaggerDoc() map[string]string {
var map_ClusterRoleBinding = map[string]string{
"": "ClusterRoleBinding references a ClusterRole, but not contain it. It can reference a ClusterRole in the global namespace, and adds who information via Subject.",
"metadata": "Standard object's metadata.",
"subject": "Subjects holds references to the objects the role applies to.",
"subjects": "Subjects holds references to the objects the role applies to.",
"roleRef": "RoleRef can only reference a ClusterRole in the global namespace. If the RoleRef cannot be resolved, the Authorizer must return an error.",
}
@ -95,7 +95,7 @@ func (Role) SwaggerDoc() map[string]string {
var map_RoleBinding = map[string]string{
"": "RoleBinding references a role, but does not contain it. It can reference a Role in the same namespace or a ClusterRole in the global namespace. It adds who information via Subjects and namespace information by which namespace it exists in. RoleBindings in a given namespace only have effect in that namespace.",
"metadata": "Standard object's metadata.",
"subject": "Subjects holds references to the objects the role applies to.",
"subjects": "Subjects holds references to the objects the role applies to.",
"roleRef": "RoleRef can reference a Role in the current namespace or a ClusterRole in the global namespace. If the RoleRef cannot be resolved, the Authorizer must return an error.",
}