github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Regenerate all

Browse Source
This commit is contained in:
Oleg Shaldybin
2016-06-06 17:44:46 -07:00
parent ab17fabe5f
commit 14a60436b2
4 changed files with 12 additions and 12 deletions
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", "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.", "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": [ "required": [
"subject", "subjects",
"roleRef" "roleRef"
], ],
"properties": { "properties": {
@@ -2701,7 +2701,7 @@
"$ref": "v1.ObjectMeta", "$ref": "v1.ObjectMeta",
"description": "Standard object's metadata." "description": "Standard object's metadata."
}, },
"subject": { "subjects": {
"type": "array", "type": "array",
"items": { "items": {
"$ref": "v1alpha1.Subject" "$ref": "v1alpha1.Subject"
@@ -3152,7 +3152,7 @@
"id": "v1alpha1.RoleBinding", "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.", "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": [ "required": [
"subject", "subjects",
"roleRef" "roleRef"
], ],
"properties": { "properties": {
@@ -3168,7 +3168,7 @@
"$ref": "v1.ObjectMeta", "$ref": "v1.ObjectMeta",
"description": "Standard object's metadata." "description": "Standard object's metadata."
}, },
"subject": { "subjects": {
"type": "array", "type": "array",
"items": { "items": {
"$ref": "v1alpha1.Subject" "$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; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
// Subjects holds references to the objects the role applies to. // 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. // RoleRef can only reference a ClusterRole in the global namespace.
// If the RoleRef cannot be resolved, the Authorizer must return an error. // 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; optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
// Subjects holds references to the objects the role applies to. // 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. // 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. // If the RoleRef cannot be resolved, the Authorizer must return an error.

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

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

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{ 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.", "": "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.", "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.", "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{ 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.", "": "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.", "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.", "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.",
} }