Skip to content

K
k3s
Unverified Commit 46b2255e authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #73250 from liggitt/optional-rules

Mark rules field as optional
parents ae2b1764 c09ccc9b
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 18 deletions
api/openapi-spec/swagger.json
View file @ 46b2255e
...@@ -89234,9 +89234,6 @@ ...@@ -89234,9 +89234,6 @@
"io.k8s.api.rbac.v1.ClusterRole": { "io.k8s.api.rbac.v1.ClusterRole": {
"description": "ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding.", "description": "ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding.",
"type": "object", "type": "object",
"required": [
"rules"
],
"properties": { "properties": {
"aggregationRule": { "aggregationRule": {
"description": "AggregationRule is an optional field that describes how to build the Rules for this ClusterRole. If AggregationRule is set, then the Rules are controller managed and direct changes to Rules will be stomped by the controller.", "description": "AggregationRule is an optional field that describes how to build the Rules for this ClusterRole. If AggregationRule is set, then the Rules are controller managed and direct changes to Rules will be stomped by the controller.",
...@@ -89426,9 +89423,6 @@ ...@@ -89426,9 +89423,6 @@
"io.k8s.api.rbac.v1.Role": { "io.k8s.api.rbac.v1.Role": {
"description": "Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding.", "description": "Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding.",
"type": "object", "type": "object",
"required": [
"rules"
],
"properties": { "properties": {
"apiVersion": { "apiVersion": {
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources", "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
...@@ -89632,9 +89626,6 @@ ...@@ -89632,9 +89626,6 @@
"io.k8s.api.rbac.v1alpha1.ClusterRole": { "io.k8s.api.rbac.v1alpha1.ClusterRole": {
"description": "ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding.", "description": "ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding.",
"type": "object", "type": "object",
"required": [
"rules"
],
"properties": { "properties": {
"aggregationRule": { "aggregationRule": {
"description": "AggregationRule is an optional field that describes how to build the Rules for this ClusterRole. If AggregationRule is set, then the Rules are controller managed and direct changes to Rules will be stomped by the controller.", "description": "AggregationRule is an optional field that describes how to build the Rules for this ClusterRole. If AggregationRule is set, then the Rules are controller managed and direct changes to Rules will be stomped by the controller.",
...@@ -89824,9 +89815,6 @@ ...@@ -89824,9 +89815,6 @@
"io.k8s.api.rbac.v1alpha1.Role": { "io.k8s.api.rbac.v1alpha1.Role": {
"description": "Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding.", "description": "Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding.",
"type": "object", "type": "object",
"required": [
"rules"
],
"properties": { "properties": {
"apiVersion": { "apiVersion": {
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources", "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
...@@ -90030,9 +90018,6 @@ ...@@ -90030,9 +90018,6 @@
"io.k8s.api.rbac.v1beta1.ClusterRole": { "io.k8s.api.rbac.v1beta1.ClusterRole": {
"description": "ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding.", "description": "ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding.",
"type": "object", "type": "object",
"required": [
"rules"
],
"properties": { "properties": {
"aggregationRule": { "aggregationRule": {
"description": "AggregationRule is an optional field that describes how to build the Rules for this ClusterRole. If AggregationRule is set, then the Rules are controller managed and direct changes to Rules will be stomped by the controller.", "description": "AggregationRule is an optional field that describes how to build the Rules for this ClusterRole. If AggregationRule is set, then the Rules are controller managed and direct changes to Rules will be stomped by the controller.",
...@@ -90222,9 +90207,6 @@ ...@@ -90222,9 +90207,6 @@
"io.k8s.api.rbac.v1beta1.Role": { "io.k8s.api.rbac.v1beta1.Role": {
"description": "Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding.", "description": "Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding.",
"type": "object", "type": "object",
"required": [
"rules"
],
"properties": { "properties": {
"apiVersion": { "apiVersion": {
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources", "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
staging/src/k8s.io/api/rbac/v1/generated.proto
View file @ 46b2255e
...@@ -43,6 +43,7 @@ message ClusterRole { ...@@ -43,6 +43,7 @@ message ClusterRole {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Rules holds all the PolicyRules for this ClusterRole // Rules holds all the PolicyRules for this ClusterRole
// +optional
repeated PolicyRule rules = 2; repeated PolicyRule rules = 2;
// AggregationRule is an optional field that describes how to build the Rules for this ClusterRole. // AggregationRule is an optional field that describes how to build the Rules for this ClusterRole.
...@@ -121,6 +122,7 @@ message Role { ...@@ -121,6 +122,7 @@ message Role {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Rules holds all the PolicyRules for this Role // Rules holds all the PolicyRules for this Role
// +optional
repeated PolicyRule rules = 2; repeated PolicyRule rules = 2;
} }
......
staging/src/k8s.io/api/rbac/v1/types.go
View file @ 46b2255e
...@@ -108,6 +108,7 @@ type Role struct { ...@@ -108,6 +108,7 @@ type Role struct {
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Rules holds all the PolicyRules for this Role // Rules holds all the PolicyRules for this Role
// +optional
Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"` Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"`
} }
...@@ -170,6 +171,7 @@ type ClusterRole struct { ...@@ -170,6 +171,7 @@ type ClusterRole struct {
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Rules holds all the PolicyRules for this ClusterRole // Rules holds all the PolicyRules for this ClusterRole
// +optional
Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"` Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"`
// AggregationRule is an optional field that describes how to build the Rules for this ClusterRole. // AggregationRule is an optional field that describes how to build the Rules for this ClusterRole.
......
staging/src/k8s.io/api/rbac/v1alpha1/generated.proto
View file @ 46b2255e
...@@ -43,6 +43,7 @@ message ClusterRole { ...@@ -43,6 +43,7 @@ message ClusterRole {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Rules holds all the PolicyRules for this ClusterRole // Rules holds all the PolicyRules for this ClusterRole
// +optional
repeated PolicyRule rules = 2; repeated PolicyRule rules = 2;
// AggregationRule is an optional field that describes how to build the Rules for this ClusterRole. // AggregationRule is an optional field that describes how to build the Rules for this ClusterRole.
...@@ -122,6 +123,7 @@ message Role { ...@@ -122,6 +123,7 @@ message Role {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Rules holds all the PolicyRules for this Role // Rules holds all the PolicyRules for this Role
// +optional
repeated PolicyRule rules = 2; repeated PolicyRule rules = 2;
} }
......
staging/src/k8s.io/api/rbac/v1alpha1/types.go
View file @ 46b2255e
...@@ -110,6 +110,7 @@ type Role struct { ...@@ -110,6 +110,7 @@ type Role struct {
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Rules holds all the PolicyRules for this Role // Rules holds all the PolicyRules for this Role
// +optional
Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"` Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"`
} }
...@@ -172,6 +173,7 @@ type ClusterRole struct { ...@@ -172,6 +173,7 @@ type ClusterRole struct {
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Rules holds all the PolicyRules for this ClusterRole // Rules holds all the PolicyRules for this ClusterRole
// +optional
Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"` Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"`
// AggregationRule is an optional field that describes how to build the Rules for this ClusterRole. // AggregationRule is an optional field that describes how to build the Rules for this ClusterRole.
......
staging/src/k8s.io/api/rbac/v1beta1/generated.proto
View file @ 46b2255e
...@@ -43,6 +43,7 @@ message ClusterRole { ...@@ -43,6 +43,7 @@ message ClusterRole {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Rules holds all the PolicyRules for this ClusterRole // Rules holds all the PolicyRules for this ClusterRole
// +optional
repeated PolicyRule rules = 2; repeated PolicyRule rules = 2;
// AggregationRule is an optional field that describes how to build the Rules for this ClusterRole. // AggregationRule is an optional field that describes how to build the Rules for this ClusterRole.
...@@ -122,6 +123,7 @@ message Role { ...@@ -122,6 +123,7 @@ message Role {
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1; optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Rules holds all the PolicyRules for this Role // Rules holds all the PolicyRules for this Role
// +optional
repeated PolicyRule rules = 2; repeated PolicyRule rules = 2;
} }
......
staging/src/k8s.io/api/rbac/v1beta1/types.go
View file @ 46b2255e
...@@ -109,6 +109,7 @@ type Role struct { ...@@ -109,6 +109,7 @@ type Role struct {
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Rules holds all the PolicyRules for this Role // Rules holds all the PolicyRules for this Role
// +optional
Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"` Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"`
} }
...@@ -171,6 +172,7 @@ type ClusterRole struct { ...@@ -171,6 +172,7 @@ type ClusterRole struct {
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Rules holds all the PolicyRules for this ClusterRole // Rules holds all the PolicyRules for this ClusterRole
// +optional
Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"` Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"`
// AggregationRule is an optional field that describes how to build the Rules for this ClusterRole. // AggregationRule is an optional field that describes how to build the Rules for this ClusterRole.
// If AggregationRule is set, then the Rules are controller managed and direct changes to Rules will be // If AggregationRule is set, then the Rules are controller managed and direct changes to Rules will be
......
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