diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 905cdbbb615..d7a21d27cef 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -36855,6 +36855,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -36865,7 +36866,7 @@ "type": "string" }, "name": { - "description": "name is the name of the resource.", + "description": "name is the plural name of the resource.", "type": "string" }, "namespaced": { @@ -36879,6 +36880,10 @@ "type": "string" } }, + "singularName": { + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.", + "type": "string" + }, "verbs": { "description": "verbs is a list of supported kube verbs (this includes get, list, watch, create, update, patch, delete, deletecollection, and proxy)", "type": "array", diff --git a/api/swagger-spec/apps_v1beta1.json b/api/swagger-spec/apps_v1beta1.json index a3c5447002c..adce1db0a05 100644 --- a/api/swagger-spec/apps_v1beta1.json +++ b/api/swagger-spec/apps_v1beta1.json @@ -4921,6 +4921,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -4928,7 +4929,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/authentication.k8s.io_v1.json b/api/swagger-spec/authentication.k8s.io_v1.json index fda24581602..4e69c633769 100644 --- a/api/swagger-spec/authentication.k8s.io_v1.json +++ b/api/swagger-spec/authentication.k8s.io_v1.json @@ -303,6 +303,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -310,7 +311,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/authentication.k8s.io_v1beta1.json b/api/swagger-spec/authentication.k8s.io_v1beta1.json index 064b5ea4460..cdab34ae37f 100644 --- a/api/swagger-spec/authentication.k8s.io_v1beta1.json +++ b/api/swagger-spec/authentication.k8s.io_v1beta1.json @@ -303,6 +303,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -310,7 +311,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/authorization.k8s.io_v1.json b/api/swagger-spec/authorization.k8s.io_v1.json index 02745de2e5d..873d330635b 100644 --- a/api/swagger-spec/authorization.k8s.io_v1.json +++ b/api/swagger-spec/authorization.k8s.io_v1.json @@ -516,6 +516,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -523,7 +524,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/authorization.k8s.io_v1beta1.json b/api/swagger-spec/authorization.k8s.io_v1beta1.json index b94a5b07f84..574ce66b8af 100644 --- a/api/swagger-spec/authorization.k8s.io_v1beta1.json +++ b/api/swagger-spec/authorization.k8s.io_v1beta1.json @@ -516,6 +516,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -523,7 +524,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/autoscaling_v1.json b/api/swagger-spec/autoscaling_v1.json index d136687feff..c7f5beeb84f 100644 --- a/api/swagger-spec/autoscaling_v1.json +++ b/api/swagger-spec/autoscaling_v1.json @@ -1464,6 +1464,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -1471,7 +1472,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/autoscaling_v2alpha1.json b/api/swagger-spec/autoscaling_v2alpha1.json index d9fe1bb2868..bb58aadf8ed 100644 --- a/api/swagger-spec/autoscaling_v2alpha1.json +++ b/api/swagger-spec/autoscaling_v2alpha1.json @@ -67,6 +67,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -74,7 +75,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/batch_v1.json b/api/swagger-spec/batch_v1.json index 73c4b10aa5f..5b5294c58c0 100644 --- a/api/swagger-spec/batch_v1.json +++ b/api/swagger-spec/batch_v1.json @@ -3386,6 +3386,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -3393,7 +3394,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/batch_v2alpha1.json b/api/swagger-spec/batch_v2alpha1.json index 904850abbb9..5cbe13273cf 100644 --- a/api/swagger-spec/batch_v2alpha1.json +++ b/api/swagger-spec/batch_v2alpha1.json @@ -67,6 +67,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -74,7 +75,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/certificates.k8s.io_v1beta1.json b/api/swagger-spec/certificates.k8s.io_v1beta1.json index 64d7e1bbbe1..25c5a41bee0 100644 --- a/api/swagger-spec/certificates.k8s.io_v1beta1.json +++ b/api/swagger-spec/certificates.k8s.io_v1beta1.json @@ -1169,6 +1169,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -1176,7 +1177,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json index a1c2278eb8a..c8105c7e9c9 100644 --- a/api/swagger-spec/extensions_v1beta1.json +++ b/api/swagger-spec/extensions_v1beta1.json @@ -9940,6 +9940,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -9947,7 +9948,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/policy_v1beta1.json b/api/swagger-spec/policy_v1beta1.json index a7bfcedf389..ac764e8ce14 100644 --- a/api/swagger-spec/policy_v1beta1.json +++ b/api/swagger-spec/policy_v1beta1.json @@ -1474,6 +1474,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -1481,7 +1482,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json b/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json index bb5699c670a..054d65432e2 100644 --- a/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json +++ b/api/swagger-spec/rbac.authorization.k8s.io_v1alpha1.json @@ -3402,6 +3402,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -3409,7 +3410,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/rbac.authorization.k8s.io_v1beta1.json b/api/swagger-spec/rbac.authorization.k8s.io_v1beta1.json index dbe707eacf0..bdc327d79e6 100644 --- a/api/swagger-spec/rbac.authorization.k8s.io_v1beta1.json +++ b/api/swagger-spec/rbac.authorization.k8s.io_v1beta1.json @@ -3402,6 +3402,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -3409,7 +3410,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/settings.k8s.io_v1alpha1.json b/api/swagger-spec/settings.k8s.io_v1alpha1.json index 37b849bae11..1379b0dcd08 100644 --- a/api/swagger-spec/settings.k8s.io_v1alpha1.json +++ b/api/swagger-spec/settings.k8s.io_v1alpha1.json @@ -2390,6 +2390,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -2397,7 +2398,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/storage.k8s.io_v1.json b/api/swagger-spec/storage.k8s.io_v1.json index 8a66b591f35..b2275221244 100644 --- a/api/swagger-spec/storage.k8s.io_v1.json +++ b/api/swagger-spec/storage.k8s.io_v1.json @@ -987,6 +987,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -994,7 +995,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/storage.k8s.io_v1beta1.json b/api/swagger-spec/storage.k8s.io_v1beta1.json index ab6b6533804..51ff822111f 100644 --- a/api/swagger-spec/storage.k8s.io_v1beta1.json +++ b/api/swagger-spec/storage.k8s.io_v1beta1.json @@ -987,6 +987,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -994,7 +995,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 0a95ec4c538..0a52a786ccf 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -20872,6 +20872,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -20879,7 +20880,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/docs/api-reference/apps/v1beta1/definitions.html b/docs/api-reference/apps/v1beta1/definitions.html index cb818fa258a..c993a20f793 100755 --- a/docs/api-reference/apps/v1beta1/definitions.html +++ b/docs/api-reference/apps/v1beta1/definitions.html @@ -5331,7 +5331,14 @@ Examples:

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -6256,7 +6263,7 @@ Examples:
diff --git a/docs/api-reference/authentication.k8s.io/v1/definitions.html b/docs/api-reference/authentication.k8s.io/v1/definitions.html index 7f4a331555f..729e9867270 100755 --- a/docs/api-reference/authentication.k8s.io/v1/definitions.html +++ b/docs/api-reference/authentication.k8s.io/v1/definitions.html @@ -674,7 +674,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -921,7 +928,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i diff --git a/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html b/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html index 568767b7c09..0fa6c59007c 100755 --- a/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/authentication.k8s.io/v1beta1/definitions.html @@ -873,7 +873,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -921,7 +928,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i diff --git a/docs/api-reference/authorization.k8s.io/v1/definitions.html b/docs/api-reference/authorization.k8s.io/v1/definitions.html index b8590e94ec3..660bbc5e4b7 100755 --- a/docs/api-reference/authorization.k8s.io/v1/definitions.html +++ b/docs/api-reference/authorization.k8s.io/v1/definitions.html @@ -818,7 +818,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -1182,7 +1189,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i diff --git a/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html b/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html index 9354876513a..5dc6a130d1c 100755 --- a/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/authorization.k8s.io/v1beta1/definitions.html @@ -742,7 +742,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -1182,7 +1189,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i diff --git a/docs/api-reference/autoscaling/v1/definitions.html b/docs/api-reference/autoscaling/v1/definitions.html index 10a8d6f6197..a8d707da35b 100755 --- a/docs/api-reference/autoscaling/v1/definitions.html +++ b/docs/api-reference/autoscaling/v1/definitions.html @@ -1292,7 +1292,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -1400,7 +1407,7 @@ Examples:
diff --git a/docs/api-reference/autoscaling/v2alpha1/definitions.html b/docs/api-reference/autoscaling/v2alpha1/definitions.html index ebbeba682bf..2ab54f76163 100755 --- a/docs/api-reference/autoscaling/v2alpha1/definitions.html +++ b/docs/api-reference/autoscaling/v2alpha1/definitions.html @@ -453,7 +453,14 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -501,7 +508,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html index d79d711ea37..29dd0183093 100755 --- a/docs/api-reference/batch/v1/definitions.html +++ b/docs/api-reference/batch/v1/definitions.html @@ -2454,7 +2454,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -5498,7 +5505,7 @@ Examples:
diff --git a/docs/api-reference/batch/v2alpha1/definitions.html b/docs/api-reference/batch/v2alpha1/definitions.html index 7fa1324a77b..60c7628b8d7 100755 --- a/docs/api-reference/batch/v2alpha1/definitions.html +++ b/docs/api-reference/batch/v2alpha1/definitions.html @@ -453,7 +453,14 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -501,7 +508,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/docs/api-reference/certificates.k8s.io/v1beta1/definitions.html b/docs/api-reference/certificates.k8s.io/v1beta1/definitions.html index d3dd7b945b2..5d4c84b24e0 100755 --- a/docs/api-reference/certificates.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/certificates.k8s.io/v1beta1/definitions.html @@ -1194,7 +1194,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -1396,7 +1403,7 @@ Examples:
diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html index 731bb1324e8..c163915f3cf 100755 --- a/docs/api-reference/extensions/v1beta1/definitions.html +++ b/docs/api-reference/extensions/v1beta1/definitions.html @@ -6451,7 +6451,14 @@ Both these may change in the future. Incoming requests are matched against the h

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -7903,7 +7910,7 @@ Both these may change in the future. Incoming requests are matched against the h diff --git a/docs/api-reference/policy/v1beta1/definitions.html b/docs/api-reference/policy/v1beta1/definitions.html index 7f55ec83b21..2013f470196 100755 --- a/docs/api-reference/policy/v1beta1/definitions.html +++ b/docs/api-reference/policy/v1beta1/definitions.html @@ -1285,7 +1285,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -1434,7 +1441,7 @@ Examples:
diff --git a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html index fd420b8c6f4..04e35008e06 100755 --- a/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html +++ b/docs/api-reference/rbac.authorization.k8s.io/v1alpha1/definitions.html @@ -1603,7 +1603,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -1755,7 +1762,7 @@ Examples:
diff --git a/docs/api-reference/rbac.authorization.k8s.io/v1beta1/definitions.html b/docs/api-reference/rbac.authorization.k8s.io/v1beta1/definitions.html index 4138f801c15..38104b2315a 100755 --- a/docs/api-reference/rbac.authorization.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/rbac.authorization.k8s.io/v1beta1/definitions.html @@ -1365,7 +1365,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -1755,7 +1762,7 @@ Examples:
diff --git a/docs/api-reference/settings.k8s.io/v1alpha1/definitions.html b/docs/api-reference/settings.k8s.io/v1alpha1/definitions.html index 766e4923672..8dab404723a 100755 --- a/docs/api-reference/settings.k8s.io/v1alpha1/definitions.html +++ b/docs/api-reference/settings.k8s.io/v1alpha1/definitions.html @@ -1819,7 +1819,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -3799,7 +3806,7 @@ Examples:
diff --git a/docs/api-reference/storage.k8s.io/v1/definitions.html b/docs/api-reference/storage.k8s.io/v1/definitions.html index f4d1f7d66ee..1564906bce3 100755 --- a/docs/api-reference/storage.k8s.io/v1/definitions.html +++ b/docs/api-reference/storage.k8s.io/v1/definitions.html @@ -1130,7 +1130,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -1238,7 +1245,7 @@ Examples:
diff --git a/docs/api-reference/storage.k8s.io/v1beta1/definitions.html b/docs/api-reference/storage.k8s.io/v1beta1/definitions.html index b0346666e22..01bb6a3e653 100755 --- a/docs/api-reference/storage.k8s.io/v1beta1/definitions.html +++ b/docs/api-reference/storage.k8s.io/v1beta1/definitions.html @@ -1130,7 +1130,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -1238,7 +1245,7 @@ Examples:
diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index 4e64f0d6fa6..28af1c325d0 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -7605,7 +7605,14 @@ Examples:

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -9843,7 +9850,7 @@ Examples:
diff --git a/federation/apis/openapi-spec/swagger.json b/federation/apis/openapi-spec/swagger.json index ee6b49b71d4..46663bb3c4e 100644 --- a/federation/apis/openapi-spec/swagger.json +++ b/federation/apis/openapi-spec/swagger.json @@ -8633,6 +8633,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -8643,7 +8644,7 @@ "type": "string" }, "name": { - "description": "name is the name of the resource.", + "description": "name is the plural name of the resource.", "type": "string" }, "namespaced": { @@ -8657,6 +8658,10 @@ "type": "string" } }, + "singularName": { + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.", + "type": "string" + }, "verbs": { "description": "verbs is a list of supported kube verbs (this includes get, list, watch, create, update, patch, delete, deletecollection, and proxy)", "type": "array", diff --git a/federation/apis/swagger-spec/extensions_v1beta1.json b/federation/apis/swagger-spec/extensions_v1beta1.json index b44ef015ce1..96471383239 100644 --- a/federation/apis/swagger-spec/extensions_v1beta1.json +++ b/federation/apis/swagger-spec/extensions_v1beta1.json @@ -529,7 +529,7 @@ "type": "string", "paramType": "query", "name": "propagationPolicy", - "description": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.", + "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.", "required": false, "allowMultiple": false }, @@ -1507,7 +1507,7 @@ "type": "string", "paramType": "query", "name": "propagationPolicy", - "description": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.", + "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.", "required": false, "allowMultiple": false }, @@ -2711,7 +2711,7 @@ "type": "string", "paramType": "query", "name": "propagationPolicy", - "description": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.", + "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.", "required": false, "allowMultiple": false }, @@ -3689,7 +3689,7 @@ "type": "string", "paramType": "query", "name": "propagationPolicy", - "description": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.", + "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.", "required": false, "allowMultiple": false }, @@ -4360,7 +4360,7 @@ "items": { "$ref": "v1beta1.DaemonSet" }, - "description": "Items is a list of daemon sets." + "description": "A list of daemon sets." } } }, @@ -4396,11 +4396,11 @@ }, "spec": { "$ref": "v1beta1.DaemonSetSpec", - "description": "Spec defines the desired behavior of this daemon set. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status" + "description": "The desired behavior of this daemon set. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status" }, "status": { "$ref": "v1beta1.DaemonSetStatus", - "description": "Status is the current status of this daemon set. This data may be out of date by some window of time. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status" + "description": "The current status of this daemon set. This data may be out of date by some window of time. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status" } } }, @@ -4523,20 +4523,20 @@ "properties": { "selector": { "$ref": "v1.LabelSelector", - "description": "Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" + "description": "A label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "template": { "$ref": "v1.PodTemplateSpec", - "description": "Template is the object that describes the pod that will be created. The DaemonSet will create exactly one copy of this pod on every node that matches the template's node selector (or on every node if no node selector is specified). More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template" + "description": "An object that describes the pod that will be created. The DaemonSet will create exactly one copy of this pod on every node that matches the template's node selector (or on every node if no node selector is specified). More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template" }, "updateStrategy": { "$ref": "v1beta1.DaemonSetUpdateStrategy", - "description": "UpdateStrategy to replace existing DaemonSet pods with new pods." + "description": "An update strategy to replace existing DaemonSet pods with new pods." }, "minReadySeconds": { "type": "integer", "format": "int32", - "description": "MinReadySeconds minimum number of seconds for which a newly created DaemonSet pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready)." + "description": "The minimum number of seconds for which a newly created DaemonSet pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready)." }, "templateGeneration": { "type": "integer", @@ -5705,7 +5705,7 @@ "items": { "$ref": "v1.EnvFromSource" }, - "description": "List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. An invalid key will prevent the container from starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated." + "description": "List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated." }, "env": { "type": "array", @@ -6362,9 +6362,6 @@ "v1.PodAffinityTerm": { "id": "v1.PodAffinityTerm", "description": "Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) that this pod should be co-located (affinity) or not co-located (anti-affinity) with, where co-located is defined as running on a node whose value of the label with key \u003ctopologyKey\u003e tches that of any node on which a pod of the set of pods is running", - "required": [ - "namespaces" - ], "properties": { "labelSelector": { "$ref": "v1.LabelSelector", @@ -6375,7 +6372,7 @@ "items": { "type": "string" }, - "description": "namespaces specifies which namespaces the labelSelector applies to (matches against); nil list means \"this pod's namespace,\" empty list means \"all namespaces\" The json tag here is not \"omitempty\" since we need to distinguish nil and empty. See https://golang.org/pkg/encoding/json/#Marshal for more details." + "description": "namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means \"this pod's namespace\"" }, "topologyKey": { "type": "string", @@ -6458,7 +6455,7 @@ }, "rollingUpdate": { "$ref": "v1beta1.RollingUpdateDaemonSet", - "description": "Rolling update config params. Present only if DaemonSetUpdateStrategy = RollingUpdate." + "description": "Rolling update config params. Present only if type = \"RollingUpdate\"." } } }, @@ -6468,7 +6465,7 @@ "properties": { "maxUnavailable": { "type": "string", - "description": "The maximum number of DaemonSet pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of total number of DaemonSet pods at the start of the update (ex: 10%). Absolute number is calculated from percentage by rounding up. This cannot be 0. Default value is 1. Example: when this is set to 30%, 30% of the currently running DaemonSet pods can be stopped for an update at any given time. The update starts by stopping at most 30% of the currently running DaemonSet pods and then brings up new DaemonSet pods in their place. Once the new pods are ready, it then proceeds onto other DaemonSet pods, thus ensuring that at least 70% of original number of DaemonSet pods are available at all times during the update." + "description": "The maximum number of DaemonSet pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of total number of DaemonSet pods at the start of the update (ex: 10%). Absolute number is calculated from percentage by rounding up. This cannot be 0. Default value is 1. Example: when this is set to 30%, at most 30% of the total number of nodes that should be running the daemon pod (i.e. status.desiredNumberScheduled) can have their pods stopped for an update at any given time. The update starts by stopping at most 30% of those DaemonSet pods and then brings up new DaemonSet pods in their place. Once the new pods are available, it then proceeds onto other DaemonSet pods, thus ensuring that at least 70% of original number of DaemonSet pods are available at all times during the update." } } }, @@ -6485,42 +6482,42 @@ "currentNumberScheduled": { "type": "integer", "format": "int32", - "description": "CurrentNumberScheduled is the number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md" + "description": "The number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md" }, "numberMisscheduled": { "type": "integer", "format": "int32", - "description": "NumberMisscheduled is the number of nodes that are running the daemon pod, but are not supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md" + "description": "The number of nodes that are running the daemon pod, but are not supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md" }, "desiredNumberScheduled": { "type": "integer", "format": "int32", - "description": "DesiredNumberScheduled is the total number of nodes that should be running the daemon pod (including nodes correctly running the daemon pod). More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md" + "description": "The total number of nodes that should be running the daemon pod (including nodes correctly running the daemon pod). More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md" }, "numberReady": { "type": "integer", "format": "int32", - "description": "NumberReady is the number of nodes that should be running the daemon pod and have one or more of the daemon pod running and ready." + "description": "The number of nodes that should be running the daemon pod and have one or more of the daemon pod running and ready." }, "observedGeneration": { "type": "integer", "format": "int64", - "description": "ObservedGeneration is the most recent generation observed by the daemon set controller." + "description": "The most recent generation observed by the daemon set controller." }, "updatedNumberScheduled": { "type": "integer", "format": "int32", - "description": "UpdatedNumberScheduled is the total number of nodes that are running updated daemon pod" + "description": "The total number of nodes that are running updated daemon pod" }, "numberAvailable": { "type": "integer", "format": "int32", - "description": "NumberAvailable is the number of nodes that should be running the daemon pod and have one or more of the daemon pod running and available (ready for at least minReadySeconds)" + "description": "The number of nodes that should be running the daemon pod and have one or more of the daemon pod running and available (ready for at least spec.minReadySeconds)" }, "numberUnavailable": { "type": "integer", "format": "int32", - "description": "NumberUnavailable is the number of nodes that should be running the daemon pod and have none of the daemon pod running and available (ready for at least minReadySeconds)" + "description": "The number of nodes that should be running the daemon pod and have none of the daemon pod running and available (ready for at least spec.minReadySeconds)" } } }, @@ -6658,7 +6655,7 @@ }, "propagationPolicy": { "$ref": "v1.DeletionPropagation", - "description": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both." + "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy." } } }, @@ -7366,6 +7363,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -7373,7 +7371,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/federation/apis/swagger-spec/federation_v1beta1.json b/federation/apis/swagger-spec/federation_v1beta1.json index c966419be30..0c249b2e214 100644 --- a/federation/apis/swagger-spec/federation_v1beta1.json +++ b/federation/apis/swagger-spec/federation_v1beta1.json @@ -473,7 +473,7 @@ "type": "string", "paramType": "query", "name": "propagationPolicy", - "description": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.", + "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.", "required": false, "allowMultiple": false }, @@ -1087,7 +1087,7 @@ }, "propagationPolicy": { "$ref": "v1.DeletionPropagation", - "description": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both." + "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy." } } }, @@ -1143,6 +1143,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -1150,7 +1151,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/federation/apis/swagger-spec/v1.json b/federation/apis/swagger-spec/v1.json index b21f6c27239..b21ba57d0a3 100644 --- a/federation/apis/swagger-spec/v1.json +++ b/federation/apis/swagger-spec/v1.json @@ -529,7 +529,7 @@ "type": "string", "paramType": "query", "name": "propagationPolicy", - "description": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.", + "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.", "required": false, "allowMultiple": false }, @@ -1342,7 +1342,7 @@ "type": "string", "paramType": "query", "name": "propagationPolicy", - "description": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.", + "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.", "required": false, "allowMultiple": false }, @@ -2099,7 +2099,7 @@ "type": "string", "paramType": "query", "name": "propagationPolicy", - "description": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.", + "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.", "required": false, "allowMultiple": false }, @@ -2932,7 +2932,7 @@ "type": "string", "paramType": "query", "name": "propagationPolicy", - "description": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.", + "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.", "required": false, "allowMultiple": false }, @@ -3745,7 +3745,7 @@ "type": "string", "paramType": "query", "name": "propagationPolicy", - "description": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.", + "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.", "required": false, "allowMultiple": false }, @@ -4535,7 +4535,7 @@ }, "propagationPolicy": { "$ref": "v1.DeletionPropagation", - "description": "Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both." + "description": "Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy." } } }, @@ -5041,6 +5041,7 @@ "description": "APIResource specifies the name of a resource and whether it is namespaced.", "required": [ "name", + "singularName", "namespaced", "kind", "verbs" @@ -5048,7 +5049,11 @@ "properties": { "name": { "type": "string", - "description": "name is the name of the resource." + "description": "name is the plural name of the resource." + }, + "singularName": { + "type": "string", + "description": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface." }, "namespaced": { "type": "boolean", diff --git a/federation/docs/api-reference/extensions/v1beta1/definitions.html b/federation/docs/api-reference/extensions/v1beta1/definitions.html index a1ddfacef87..c04fb6f6172 100755 --- a/federation/docs/api-reference/extensions/v1beta1/definitions.html +++ b/federation/docs/api-reference/extensions/v1beta1/definitions.html @@ -610,56 +610,56 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

currentNumberScheduled

-

CurrentNumberScheduled is the number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md

+

The number of nodes that are running at least 1 daemon pod and are supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md

true

integer (int32)

numberMisscheduled

-

NumberMisscheduled is the number of nodes that are running the daemon pod, but are not supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md

+

The number of nodes that are running the daemon pod, but are not supposed to run the daemon pod. More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md

true

integer (int32)

desiredNumberScheduled

-

DesiredNumberScheduled is the total number of nodes that should be running the daemon pod (including nodes correctly running the daemon pod). More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md

+

The total number of nodes that should be running the daemon pod (including nodes correctly running the daemon pod). More info: http://releases.k8s.io/HEAD/docs/admin/daemons.md

true

integer (int32)

numberReady

-

NumberReady is the number of nodes that should be running the daemon pod and have one or more of the daemon pod running and ready.

+

The number of nodes that should be running the daemon pod and have one or more of the daemon pod running and ready.

true

integer (int32)

observedGeneration

-

ObservedGeneration is the most recent generation observed by the daemon set controller.

+

The most recent generation observed by the daemon set controller.

false

integer (int64)

updatedNumberScheduled

-

UpdatedNumberScheduled is the total number of nodes that are running updated daemon pod

+

The total number of nodes that are running updated daemon pod

false

integer (int32)

numberAvailable

-

NumberAvailable is the number of nodes that should be running the daemon pod and have one or more of the daemon pod running and available (ready for at least minReadySeconds)

+

The number of nodes that should be running the daemon pod and have one or more of the daemon pod running and available (ready for at least spec.minReadySeconds)

false

integer (int32)

numberUnavailable

-

NumberUnavailable is the number of nodes that should be running the daemon pod and have none of the daemon pod running and available (ready for at least minReadySeconds)

+

The number of nodes that should be running the daemon pod and have none of the daemon pod running and available (ready for at least spec.minReadySeconds)

false

integer (int32)

@@ -1818,7 +1818,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

maxUnavailable

-

The maximum number of DaemonSet pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of total number of DaemonSet pods at the start of the update (ex: 10%). Absolute number is calculated from percentage by rounding up. This cannot be 0. Default value is 1. Example: when this is set to 30%, 30% of the currently running DaemonSet pods can be stopped for an update at any given time. The update starts by stopping at most 30% of the currently running DaemonSet pods and then brings up new DaemonSet pods in their place. Once the new pods are ready, it then proceeds onto other DaemonSet pods, thus ensuring that at least 70% of original number of DaemonSet pods are available at all times during the update.

+

The maximum number of DaemonSet pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of total number of DaemonSet pods at the start of the update (ex: 10%). Absolute number is calculated from percentage by rounding up. This cannot be 0. Default value is 1. Example: when this is set to 30%, at most 30% of the total number of nodes that should be running the daemon pod (i.e. status.desiredNumberScheduled) can have their pods stopped for an update at any given time. The update starts by stopping at most 30% of those DaemonSet pods and then brings up new DaemonSet pods in their place. Once the new pods are available, it then proceeds onto other DaemonSet pods, thus ensuring that at least 70% of original number of DaemonSet pods are available at all times during the update.

false

string

@@ -2053,28 +2053,28 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

selector

-

Selector is a label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

+

A label query over pods that are managed by the daemon set. Must match in order to be controlled. If empty, defaulted to labels on Pod template. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors

false

v1.LabelSelector

template

-

Template is the object that describes the pod that will be created. The DaemonSet will create exactly one copy of this pod on every node that matches the template’s node selector (or on every node if no node selector is specified). More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template

+

An object that describes the pod that will be created. The DaemonSet will create exactly one copy of this pod on every node that matches the template’s node selector (or on every node if no node selector is specified). More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template

true

v1.PodTemplateSpec

updateStrategy

-

UpdateStrategy to replace existing DaemonSet pods with new pods.

+

An update strategy to replace existing DaemonSet pods with new pods.

false

v1beta1.DaemonSetUpdateStrategy

minReadySeconds

-

MinReadySeconds minimum number of seconds for which a newly created DaemonSet pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready).

+

The minimum number of seconds for which a newly created DaemonSet pod should be ready without any of its container crashing, for it to be considered available. Defaults to 0 (pod will be considered available as soon as it is ready).

false

integer (int32)

@@ -2435,8 +2435,8 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

namespaces

-

namespaces specifies which namespaces the labelSelector applies to (matches against); nil list means "this pod’s namespace," empty list means "all namespaces" The json tag here is not "omitempty" since we need to distinguish nil and empty. See https://golang.org/pkg/encoding/json/#Marshal for more details.

-

true

+

namespaces specifies which namespaces the labelSelector applies to (matches against); null or empty list means "this pod’s namespace"

+

false

string array

@@ -3049,7 +3049,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

rollingUpdate

-

Rolling update config params. Present only if DaemonSetUpdateStrategy = RollingUpdate.

+

Rolling update config params. Present only if type = "RollingUpdate".

false

v1beta1.RollingUpdateDaemonSet

@@ -3159,7 +3159,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

propagationPolicy

-

Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.

+

Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.

false

v1.DeletionPropagation

@@ -3373,6 +3373,13 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

v1.PortworxVolumeSource

+ +

scaleIO

+

ScaleIO represents a ScaleIO persistent volume attached and mounted on Kubernetes nodes.

+

false

+

v1.ScaleIOVolumeSource

+ + @@ -3423,7 +3430,7 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

items

-

Items is a list of daemon sets.

+

A list of daemon sets.

true

v1beta1.DaemonSet array

@@ -3848,68 +3855,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i - -
-

v1.ContainerPort

-
-

ContainerPort represents a network port in a single container.

-
- ------- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

name

If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services.

false

string

hostPort

Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this.

false

integer (int32)

containerPort

Number of port to expose on the pod’s IP address. This must be a valid port number, 0 < x < 65536.

true

integer (int32)

protocol

Protocol for port. Must be UDP or TCP. Defaults to "TCP".

false

string

hostIP

What host IP to bind the external port to.

false

string

-

v1.PodSpec

@@ -4091,6 +4036,68 @@ Populated by the system when a graceful deletion is requested. Read-only. More i +
+
+

v1.ContainerPort

+
+

ContainerPort represents a network port in a single container.

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

name

If specified, this must be an IANA_SVC_NAME and unique within the pod. Each named port in a pod must have a unique name. Name for the port that can be referred to by services.

false

string

hostPort

Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this.

false

integer (int32)

containerPort

Number of port to expose on the pod’s IP address. This must be a valid port number, 0 < x < 65536.

true

integer (int32)

protocol

Protocol for port. Must be UDP or TCP. Defaults to "TCP".

false

string

hostIP

What host IP to bind the external port to.

false

string

+

v1.Lifecycle

@@ -4579,6 +4586,103 @@ Examples:
+
+
+

v1.ScaleIOVolumeSource

+
+

ScaleIOVolumeSource represents a persistent ScaleIO volume

+
+ +++++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

gateway

The host address of the ScaleIO API Gateway.

true

string

system

The name of the storage system as configured in ScaleIO.

true

string

secretRef

SecretRef references to the secret for ScaleIO user and other sensitive information. If this is not provided, Login operation will fail.

true

v1.LocalObjectReference

sslEnabled

Flag to enable/disable SSL communication with Gateway, default false

false

boolean

false

protectionDomain

The name of the Protection Domain for the configured storage (defaults to "default").

false

string

storagePool

The Storage Pool associated with the protection domain (defaults to "default").

false

string

storageMode

Indicates whether the storage for a volume should be thick or thin (defaults to "thin").

false

string

volumeName

The name of a volume already created in the ScaleIO system that is associated with this volume source.

false

string

fsType

Filesystem type to mount. Must be a filesystem type supported by the host operating system. Ex. "ext4", "xfs", "ntfs". Implicitly inferred to be "ext4" if unspecified.

false

string

readOnly

Defaults to false (read/write). ReadOnly here will force the ReadOnly setting in VolumeMounts.

false

boolean

false

+

v1.PhotonPersistentDiskVolumeSource

@@ -5057,40 +5161,6 @@ Examples:

v1.DeletionPropagation

-
-
-

v1.TCPSocketAction

-
-

TCPSocketAction describes an action based on opening a socket

-
- ------- - - - - - - - - - - - - - - - - - - -
NameDescriptionRequiredSchemaDefault

port

Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.

true

string

-

v1beta1.DeploymentStrategy

@@ -5132,6 +5202,40 @@ Examples:
+
+
+

v1.TCPSocketAction

+
+

TCPSocketAction describes an action based on opening a socket

+
+ +++++++ + + + + + + + + + + + + + + + + + + +
NameDescriptionRequiredSchemaDefault

port

Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME.

true

string

+

v1beta1.IngressRule

@@ -5404,7 +5508,7 @@ Both these may change in the future. Incoming requests are matched against the h

envFrom

-

List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. An invalid key will prevent the container from starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated.

+

List of sources to populate environment variables in the container. The keys defined within a source must be a C_IDENTIFIER. All invalid keys will be reported as an event when the container is starting. When a key exists in multiple sources, the value associated with the last source will take precedence. Values defined by an Env with a duplicate key will take precedence. Cannot be updated.

false

v1.EnvFromSource array

@@ -5731,7 +5835,14 @@ Both these may change in the future. Incoming requests are matched against the h

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -6009,14 +6120,14 @@ Both these may change in the future. Incoming requests are matched against the h

spec

-

Spec defines the desired behavior of this daemon set. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

+

The desired behavior of this daemon set. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

v1beta1.DaemonSetSpec

status

-

Status is the current status of this daemon set. This data may be out of date by some window of time. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

+

The current status of this daemon set. This data may be out of date by some window of time. Populated by the system. Read-only. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status

false

v1beta1.DaemonSetStatus

@@ -6879,7 +6990,7 @@ Both these may change in the future. Incoming requests are matched against the h
diff --git a/federation/docs/api-reference/extensions/v1beta1/operations.html b/federation/docs/api-reference/extensions/v1beta1/operations.html index 47819e86043..9b75694c2cd 100755 --- a/federation/docs/api-reference/extensions/v1beta1/operations.html +++ b/federation/docs/api-reference/extensions/v1beta1/operations.html @@ -1642,7 +1642,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

QueryParameter

propagationPolicy

-

Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.

+

Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.

false

string

@@ -2994,7 +2994,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

QueryParameter

propagationPolicy

-

Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.

+

Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.

false

string

@@ -4852,7 +4852,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

QueryParameter

propagationPolicy

-

Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.

+

Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.

false

string

@@ -6204,7 +6204,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

QueryParameter

propagationPolicy

-

Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.

+

Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.

false

string

@@ -9220,7 +9220,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
diff --git a/federation/docs/api-reference/federation/v1beta1/definitions.html b/federation/docs/api-reference/federation/v1beta1/definitions.html index 4ab54bd8d66..f5bac1d8960 100755 --- a/federation/docs/api-reference/federation/v1beta1/definitions.html +++ b/federation/docs/api-reference/federation/v1beta1/definitions.html @@ -503,7 +503,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

propagationPolicy

-

Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.

+

Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.

false

v1.DeletionPropagation

@@ -1298,7 +1298,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -1468,7 +1475,7 @@ Examples:
diff --git a/federation/docs/api-reference/federation/v1beta1/operations.html b/federation/docs/api-reference/federation/v1beta1/operations.html index 843c9f2ab95..d015cbe5c18 100755 --- a/federation/docs/api-reference/federation/v1beta1/operations.html +++ b/federation/docs/api-reference/federation/v1beta1/operations.html @@ -1155,7 +1155,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

QueryParameter

propagationPolicy

-

Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.

+

Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.

false

string

@@ -1789,7 +1789,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/federation/docs/api-reference/v1/definitions.html b/federation/docs/api-reference/v1/definitions.html index 317e1115628..a1fa3a6d0e4 100755 --- a/federation/docs/api-reference/v1/definitions.html +++ b/federation/docs/api-reference/v1/definitions.html @@ -1332,7 +1332,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

propagationPolicy

-

Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.

+

Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.

false

v1.DeletionPropagation

@@ -1984,7 +1984,14 @@ Populated by the system when a graceful deletion is requested. Read-only. More i

name

-

name is the name of the resource.

+

name is the plural name of the resource.

+

true

+

string

+ + + +

singularName

+

singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.

true

string

@@ -2226,7 +2233,7 @@ Examples:
diff --git a/federation/docs/api-reference/v1/operations.html b/federation/docs/api-reference/v1/operations.html index 3fa99f7ef84..0623e65e6d8 100755 --- a/federation/docs/api-reference/v1/operations.html +++ b/federation/docs/api-reference/v1/operations.html @@ -1896,7 +1896,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

QueryParameter

propagationPolicy

-

Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.

+

Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.

false

string

@@ -2869,7 +2869,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

QueryParameter

propagationPolicy

-

Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.

+

Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.

false

string

@@ -3842,7 +3842,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

QueryParameter

propagationPolicy

-

Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.

+

Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.

false

string

@@ -4815,7 +4815,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

QueryParameter

propagationPolicy

-

Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.

+

Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.

false

string

@@ -5724,7 +5724,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }

QueryParameter

propagationPolicy

-

Whether and how garbage collection will be performed. Defaults to Default. Either this field or OrphanDependents may be set, but not both.

+

Whether and how garbage collection will be performed. Either this field or OrphanDependents may be set, but not both. The default policy is decided by the existing finalizer set in the metadata.finalizers and the resource-specific default policy.

false

string

@@ -8895,7 +8895,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } diff --git a/hack/make-rules/test-cmd-util.sh b/hack/make-rules/test-cmd-util.sh index 5cd3da9b855..7b627b6345e 100644 --- a/hack/make-rules/test-cmd-util.sh +++ b/hack/make-rules/test-cmd-util.sh @@ -2955,7 +2955,7 @@ runTests() { output_message=$(kubectl get --raw=/api/v1) ## test if a short name is exported during discovery - kube::test::if_has_string "${output_message}" '{"name":"configmaps","namespaced":true,"kind":"ConfigMap","verbs":\["create","delete","deletecollection","get","list","patch","update","watch"\],"shortNames":\["cm"\]}' + kube::test::if_has_string "${output_message}" '{"name":"configmaps","singularName":"","namespaced":true,"kind":"ConfigMap","verbs":\["create","delete","deletecollection","get","list","patch","update","watch"\],"shortNames":\["cm"\]}' ########################### # POD creation / deletion # diff --git a/pkg/generated/openapi/zz_generated.openapi.go b/pkg/generated/openapi/zz_generated.openapi.go index 4b38767d724..7b946fdb720 100644 --- a/pkg/generated/openapi/zz_generated.openapi.go +++ b/pkg/generated/openapi/zz_generated.openapi.go @@ -165,7 +165,14 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope Properties: map[string]spec.Schema{ "name": { SchemaProps: spec.SchemaProps{ - Description: "name is the name of the resource.", + Description: "name is the plural name of the resource.", + Type: []string{"string"}, + Format: "", + }, + }, + "singularName": { + SchemaProps: spec.SchemaProps{ + Description: "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.", Type: []string{"string"}, Format: "", }, @@ -213,7 +220,7 @@ func GetOpenAPIDefinitions(ref openapi.ReferenceCallback) map[string]openapi.Ope }, }, }, - Required: []string{"name", "namespaced", "kind", "verbs"}, + Required: []string{"name", "singularName", "namespaced", "kind", "verbs"}, }, }, Dependencies: []string{}, diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go index 72282474d4c..556938470d1 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go @@ -390,6 +390,10 @@ func (m *APIResource) MarshalTo(data []byte) (int, error) { i += copy(data[i:], s) } } + data[i] = 0x32 + i++ + i = encodeVarintGenerated(data, i, uint64(len(m.SingularName))) + i += copy(data[i:], m.SingularName) return i, nil } @@ -1507,6 +1511,8 @@ func (m *APIResource) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) } } + l = len(m.SingularName) + n += 1 + l + sovGenerated(uint64(l)) return n } @@ -1957,6 +1963,7 @@ func (this *APIResource) String() string { `Kind:` + fmt.Sprintf("%v", this.Kind) + `,`, `Verbs:` + strings.Replace(fmt.Sprintf("%v", this.Verbs), "Verbs", "Verbs", 1) + `,`, `ShortNames:` + fmt.Sprintf("%v", this.ShortNames) + `,`, + `SingularName:` + fmt.Sprintf("%v", this.SingularName) + `,`, `}`, }, "") return s @@ -2678,6 +2685,35 @@ func (m *APIResource) Unmarshal(data []byte) error { } m.ShortNames = append(m.ShortNames, string(data[iNdEx:postIndex])) iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SingularName", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := data[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SingularName = string(data[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(data[iNdEx:]) @@ -6776,140 +6812,142 @@ var ( ) var fileDescriptorGenerated = []byte{ - // 2160 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x19, 0xcd, 0x6f, 0x23, 0x57, - 0x3d, 0x63, 0xc7, 0x5e, 0xfb, 0xe7, 0x38, 0x1f, 0xaf, 0x59, 0x70, 0x23, 0x61, 0xa7, 0xd3, 0x0a, - 0xa5, 0xb0, 0xb5, 0x49, 0x0a, 0xd5, 0xb2, 0xc0, 0x42, 0x26, 0xce, 0x46, 0x51, 0x37, 0x9b, 0xe8, - 0xa5, 0xbb, 0x88, 0x65, 0x85, 0x98, 0xcc, 0xbc, 0x38, 0x43, 0xc6, 0x33, 0xc3, 0x7b, 0x63, 0x6f, - 0x4c, 0x0f, 0x54, 0x2a, 0x48, 0x1c, 0x10, 0xda, 0x23, 0x07, 0x84, 0xba, 0x82, 0x1b, 0x37, 0xfe, - 0x06, 0x24, 0xf6, 0x58, 0x89, 0x0b, 0x07, 0x64, 0xb1, 0xee, 0x81, 0x23, 0xf7, 0x9c, 0xd0, 0x7b, - 0xf3, 0xe6, 0xcb, 0x8e, 0x9b, 0x31, 0xed, 0xa1, 0xa7, 0x78, 0x7e, 0xdf, 0xef, 0xf7, 0xfd, 0x5e, - 0xe0, 0xe0, 0xfc, 0x36, 0x6b, 0x5a, 0x6e, 0xeb, 0xbc, 0x77, 0x42, 0xa8, 0x43, 0x7c, 0xc2, 0x5a, - 0x7d, 0xe2, 0x98, 0x2e, 0x6d, 0x49, 0x84, 0xee, 0x59, 0x5d, 0xdd, 0x38, 0xb3, 0x1c, 0x42, 0x07, - 0x2d, 0xef, 0xbc, 0xc3, 0x01, 0xac, 0xd5, 0x25, 0xbe, 0xde, 0xea, 0x6f, 0xb6, 0x3a, 0xc4, 0x21, - 0x54, 0xf7, 0x89, 0xd9, 0xf4, 0xa8, 0xeb, 0xbb, 0xe8, 0x8d, 0x80, 0xab, 0x99, 0xe4, 0x6a, 0x7a, - 0xe7, 0x1d, 0x0e, 0x60, 0x4d, 0xce, 0xd5, 0xec, 0x6f, 0xae, 0xbd, 0xd5, 0xb1, 0xfc, 0xb3, 0xde, - 0x49, 0xd3, 0x70, 0xbb, 0xad, 0x8e, 0xdb, 0x71, 0x5b, 0x82, 0xf9, 0xa4, 0x77, 0x2a, 0xbe, 0xc4, - 0x87, 0xf8, 0x15, 0x08, 0x5d, 0x9b, 0x6a, 0x0a, 0xed, 0x39, 0xbe, 0xd5, 0x25, 0xe3, 0x56, 0xac, - 0xbd, 0x73, 0x1d, 0x03, 0x33, 0xce, 0x48, 0x57, 0x9f, 0xe0, 0x7b, 0x7b, 0x1a, 0x5f, 0xcf, 0xb7, - 0xec, 0x96, 0xe5, 0xf8, 0xcc, 0xa7, 0xe3, 0x4c, 0xea, 0xdf, 0xf3, 0x50, 0xda, 0x3e, 0xda, 0xdf, - 0xa3, 0x6e, 0xcf, 0x43, 0xeb, 0x30, 0xef, 0xe8, 0x5d, 0x52, 0x53, 0xd6, 0x95, 0x8d, 0xb2, 0xb6, - 0xf0, 0x62, 0xd8, 0x98, 0x1b, 0x0d, 0x1b, 0xf3, 0x0f, 0xf4, 0x2e, 0xc1, 0x02, 0x83, 0x6c, 0x28, - 0xf5, 0x09, 0x65, 0x96, 0xeb, 0xb0, 0x5a, 0x6e, 0x3d, 0xbf, 0x51, 0xd9, 0xba, 0xdb, 0xcc, 0xe2, - 0xb4, 0xa6, 0x50, 0xf0, 0x28, 0x60, 0xbd, 0xe7, 0xd2, 0xb6, 0xc5, 0x0c, 0xb7, 0x4f, 0xe8, 0x40, - 0x5b, 0x96, 0x5a, 0x4a, 0x12, 0xc9, 0x70, 0xa4, 0x01, 0xfd, 0x4a, 0x81, 0x65, 0x8f, 0x92, 0x53, - 0x42, 0x29, 0x31, 0x25, 0xbe, 0x96, 0x5f, 0x57, 0x3e, 0x07, 0xb5, 0x35, 0xa9, 0x76, 0xf9, 0x68, - 0x4c, 0x3e, 0x9e, 0xd0, 0x88, 0xfe, 0xa4, 0xc0, 0x1a, 0x23, 0xb4, 0x4f, 0xe8, 0xb6, 0x69, 0x52, - 0xc2, 0x98, 0x36, 0xd8, 0xb1, 0x2d, 0xe2, 0xf8, 0x3b, 0xfb, 0x6d, 0xcc, 0x6a, 0xf3, 0xc2, 0x0f, - 0xdf, 0xcf, 0x66, 0xd0, 0xf1, 0x34, 0x39, 0x9a, 0x2a, 0x2d, 0x5a, 0x9b, 0x4a, 0xc2, 0xf0, 0xa7, - 0x98, 0xa1, 0x9e, 0xc2, 0x42, 0x18, 0xc8, 0xfb, 0x16, 0xf3, 0xd1, 0x23, 0x28, 0x76, 0xf8, 0x07, - 0xab, 0x29, 0xc2, 0xc0, 0x66, 0x36, 0x03, 0x43, 0x19, 0xda, 0xa2, 0xb4, 0xa7, 0x28, 0x3e, 0x19, - 0x96, 0xd2, 0xd4, 0x0f, 0x73, 0x50, 0xd9, 0x3e, 0xda, 0xc7, 0x84, 0xb9, 0x3d, 0x6a, 0x90, 0x0c, - 0x49, 0xb3, 0x05, 0xc0, 0xff, 0x32, 0x4f, 0x37, 0x88, 0x59, 0xcb, 0xad, 0x2b, 0x1b, 0x25, 0x0d, - 0x49, 0x3a, 0x78, 0x10, 0x61, 0x70, 0x82, 0x8a, 0x4b, 0x3d, 0xb7, 0x1c, 0x53, 0x44, 0x3b, 0x21, - 0xf5, 0x5d, 0xcb, 0x31, 0xb1, 0xc0, 0xa0, 0xfb, 0x50, 0xe8, 0x13, 0x7a, 0xc2, 0xfd, 0xcf, 0x13, - 0xe2, 0xeb, 0xd9, 0x8e, 0xf7, 0x88, 0xb3, 0x68, 0xe5, 0xd1, 0xb0, 0x51, 0x10, 0x3f, 0x71, 0x20, - 0x04, 0x35, 0x01, 0xd8, 0x99, 0x4b, 0x7d, 0x61, 0x4e, 0xad, 0xb0, 0x9e, 0xdf, 0x28, 0x6b, 0x8b, - 0xdc, 0xbe, 0xe3, 0x08, 0x8a, 0x13, 0x14, 0xea, 0x5f, 0x15, 0x58, 0x4a, 0x78, 0x41, 0x78, 0xfc, - 0x36, 0x2c, 0x74, 0x12, 0xf9, 0x26, 0x3d, 0xb2, 0x2a, 0x6d, 0x5f, 0x48, 0xe6, 0x22, 0x4e, 0x51, - 0x22, 0x02, 0x65, 0x2a, 0x25, 0x85, 0x75, 0xb5, 0x99, 0x39, 0x5c, 0xa1, 0x0d, 0xb1, 0xa6, 0x04, - 0x90, 0xe1, 0x58, 0xb2, 0xfa, 0x1f, 0x45, 0x84, 0x2e, 0xac, 0x34, 0xb4, 0x91, 0xa8, 0x66, 0x45, - 0x1c, 0x79, 0x61, 0x4a, 0x25, 0x5e, 0x53, 0x02, 0xb9, 0x2f, 0x44, 0x09, 0xdc, 0x29, 0xfd, 0xfe, - 0xa3, 0xc6, 0xdc, 0x07, 0xff, 0x5a, 0x9f, 0x53, 0x3f, 0xc9, 0x41, 0xb5, 0x4d, 0x6c, 0xe2, 0x93, - 0x43, 0xcf, 0x17, 0x27, 0xb8, 0x07, 0xa8, 0x43, 0x75, 0x83, 0x1c, 0x11, 0x6a, 0xb9, 0xe6, 0x31, - 0x31, 0x5c, 0xc7, 0x64, 0x22, 0x44, 0x79, 0xed, 0x4b, 0xa3, 0x61, 0x03, 0xed, 0x4d, 0x60, 0xf1, - 0x15, 0x1c, 0xc8, 0x86, 0xaa, 0x47, 0xc5, 0x6f, 0xcb, 0x97, 0x6d, 0x90, 0xa7, 0xdf, 0xdb, 0xd9, - 0xce, 0x7e, 0x94, 0x64, 0xd5, 0x56, 0x46, 0xc3, 0x46, 0x35, 0x05, 0xc2, 0x69, 0xe1, 0xe8, 0x07, - 0xb0, 0xec, 0x52, 0xef, 0x4c, 0x77, 0xda, 0xc4, 0x23, 0x8e, 0x49, 0x1c, 0x9f, 0x89, 0x92, 0x28, - 0x69, 0xab, 0xbc, 0x79, 0x1d, 0x8e, 0xe1, 0xf0, 0x04, 0x35, 0x7a, 0x0c, 0x2b, 0x1e, 0x75, 0x3d, - 0xbd, 0xa3, 0x73, 0x89, 0x47, 0xae, 0x6d, 0x19, 0x03, 0x51, 0x32, 0x65, 0xed, 0xd6, 0x68, 0xd8, - 0x58, 0x39, 0x1a, 0x47, 0x5e, 0x0e, 0x1b, 0xaf, 0x08, 0xd7, 0x71, 0x48, 0x8c, 0xc4, 0x93, 0x62, - 0xd4, 0x7d, 0x28, 0xb5, 0x7b, 0x54, 0x40, 0xd0, 0xf7, 0xa0, 0x64, 0xca, 0xdf, 0xd2, 0xab, 0xaf, - 0x85, 0x9d, 0x3d, 0xa4, 0xb9, 0x1c, 0x36, 0xaa, 0x7c, 0x80, 0x35, 0x43, 0x00, 0x8e, 0x58, 0xd4, - 0x27, 0x50, 0xdd, 0xbd, 0xf0, 0x5c, 0xea, 0x87, 0xf1, 0xfa, 0x2a, 0x14, 0x89, 0x00, 0x08, 0x69, - 0xa5, 0xb8, 0x1d, 0x05, 0x64, 0x58, 0x62, 0xd1, 0xeb, 0x50, 0x20, 0x17, 0xba, 0xe1, 0xcb, 0xbe, - 0x52, 0x95, 0x64, 0x85, 0x5d, 0x0e, 0xc4, 0x01, 0x4e, 0x3d, 0x04, 0xd8, 0x23, 0x91, 0xe8, 0x6d, - 0x58, 0x0a, 0x6b, 0x22, 0x5d, 0xaa, 0x5f, 0x96, 0xcc, 0x4b, 0x38, 0x8d, 0xc6, 0xe3, 0xf4, 0xea, - 0x13, 0x28, 0x8b, 0x72, 0xe6, 0xfd, 0x88, 0x9b, 0x20, 0xaa, 0x59, 0x4a, 0x89, 0x4c, 0x10, 0x14, - 0x38, 0xc0, 0x45, 0x0d, 0x2d, 0x37, 0xad, 0xa1, 0x25, 0xb2, 0xd7, 0x86, 0x6a, 0xc0, 0x1b, 0xf6, - 0xd8, 0x4c, 0x1a, 0x6e, 0x41, 0x29, 0x34, 0x53, 0x6a, 0x89, 0x66, 0x6b, 0x28, 0x08, 0x47, 0x14, - 0x09, 0x6d, 0x67, 0x90, 0x6a, 0x4d, 0xd9, 0x94, 0xbd, 0x09, 0x37, 0x64, 0x73, 0x90, 0xba, 0x96, - 0x24, 0xd9, 0x8d, 0xd0, 0x67, 0x21, 0x3e, 0xa1, 0xe9, 0x97, 0x50, 0x9b, 0x36, 0x90, 0x3f, 0x43, - 0xf3, 0xcc, 0x6e, 0x8a, 0xfa, 0x3b, 0x05, 0x96, 0x93, 0x92, 0xb2, 0x87, 0x2f, 0xbb, 0x92, 0xeb, - 0x47, 0x57, 0xc2, 0x23, 0x7f, 0x54, 0x60, 0x35, 0x75, 0xb4, 0x99, 0x22, 0x3e, 0x83, 0x51, 0xc9, - 0xe4, 0xc8, 0xcf, 0x90, 0x1c, 0xff, 0xc8, 0x41, 0xf5, 0xbe, 0x7e, 0x42, 0xec, 0x63, 0x62, 0x13, - 0xc3, 0x77, 0x29, 0x7a, 0x1f, 0x2a, 0x5d, 0xdd, 0x37, 0xce, 0x04, 0x34, 0x5c, 0x2e, 0xda, 0xd9, - 0xda, 0x5f, 0x4a, 0x52, 0xf3, 0x20, 0x16, 0xb3, 0xeb, 0xf8, 0x74, 0xa0, 0xbd, 0x22, 0x4d, 0xaa, - 0x24, 0x30, 0x38, 0xa9, 0x4d, 0x6c, 0x84, 0xe2, 0x7b, 0xf7, 0xc2, 0xe3, 0xfd, 0x7f, 0xf6, 0x45, - 0x34, 0x65, 0x02, 0x26, 0x3f, 0xef, 0x59, 0x94, 0x74, 0x89, 0xe3, 0xc7, 0x1b, 0xe1, 0xc1, 0x98, - 0x7c, 0x3c, 0xa1, 0x71, 0xed, 0x2e, 0x2c, 0x8f, 0x1b, 0x8f, 0x96, 0x21, 0x7f, 0x4e, 0x06, 0x41, - 0xbc, 0x30, 0xff, 0x89, 0x56, 0xa1, 0xd0, 0xd7, 0xed, 0x9e, 0xac, 0x46, 0x1c, 0x7c, 0xdc, 0xc9, - 0xdd, 0x56, 0xd4, 0x3f, 0x2b, 0x50, 0x9b, 0x66, 0x08, 0xfa, 0x4a, 0x42, 0x90, 0x56, 0x91, 0x56, - 0xe5, 0xdf, 0x25, 0x83, 0x40, 0xea, 0x2e, 0x94, 0x5c, 0x8f, 0xef, 0xf0, 0x2e, 0x95, 0x51, 0x7f, - 0x33, 0x8c, 0xe4, 0xa1, 0x84, 0x5f, 0x0e, 0x1b, 0x37, 0x53, 0xe2, 0x43, 0x04, 0x8e, 0x58, 0x91, - 0x0a, 0x45, 0x61, 0x0f, 0x9f, 0x27, 0x7c, 0xf2, 0x03, 0xef, 0xad, 0x8f, 0x04, 0x04, 0x4b, 0x8c, - 0xfa, 0x3e, 0x94, 0xf8, 0x62, 0x73, 0x40, 0x7c, 0x9d, 0x27, 0x10, 0x23, 0xf6, 0xe9, 0x7d, 0xcb, - 0x39, 0x97, 0xa6, 0x45, 0x09, 0x74, 0x2c, 0xe1, 0x38, 0xa2, 0xb8, 0xaa, 0xc5, 0xe6, 0x66, 0x6c, - 0xb1, 0x7f, 0xc9, 0x41, 0x85, 0x6b, 0x0f, 0xbb, 0xf6, 0x77, 0xa0, 0x6a, 0x27, 0xcf, 0x24, 0xad, - 0xb8, 0x29, 0x05, 0xa6, 0xb3, 0x14, 0xa7, 0x69, 0x39, 0xf3, 0xa9, 0x45, 0x6c, 0x33, 0x62, 0xce, - 0xa5, 0x99, 0xef, 0x25, 0x91, 0x38, 0x4d, 0xcb, 0x6b, 0xf1, 0x29, 0x8f, 0xb6, 0x9c, 0xbc, 0x51, - 0x2d, 0xfe, 0x90, 0x03, 0x71, 0x80, 0xbb, 0xea, 0xc4, 0xf3, 0xb3, 0x9d, 0x18, 0xdd, 0x81, 0x45, - 0x3e, 0x1e, 0xdd, 0x9e, 0x1f, 0xae, 0x27, 0x05, 0x31, 0x48, 0xd1, 0x68, 0xd8, 0x58, 0x7c, 0x2f, - 0x85, 0xc1, 0x63, 0x94, 0xea, 0x87, 0x00, 0x70, 0x78, 0xf2, 0x33, 0x62, 0x04, 0xd1, 0xba, 0x7e, - 0x29, 0xe7, 0xfd, 0x56, 0xde, 0x05, 0x39, 0x54, 0x3a, 0x24, 0xee, 0xb7, 0x09, 0x1c, 0x4e, 0x51, - 0xa2, 0x16, 0x94, 0xa3, 0x45, 0x5d, 0xf6, 0x92, 0x15, 0xc9, 0x56, 0x8e, 0xb6, 0x79, 0x1c, 0xd3, - 0xa4, 0x52, 0x67, 0xfe, 0xda, 0xd4, 0xd1, 0x20, 0xdf, 0xb3, 0x4c, 0x71, 0xf4, 0xb2, 0xf6, 0x8d, - 0x30, 0xfd, 0x1f, 0xee, 0xb7, 0x2f, 0x87, 0x8d, 0xd7, 0xa6, 0x5d, 0x71, 0xfd, 0x81, 0x47, 0x58, - 0xf3, 0xe1, 0x7e, 0x1b, 0x73, 0xe6, 0xab, 0x82, 0x51, 0x9c, 0x31, 0x18, 0x5b, 0x00, 0xf2, 0xd4, - 0x9c, 0xfb, 0x46, 0x10, 0x88, 0xf0, 0xd2, 0xb2, 0x17, 0x61, 0x70, 0x82, 0x0a, 0x31, 0x58, 0x31, - 0x28, 0x11, 0xbf, 0x79, 0xb8, 0x98, 0xaf, 0x77, 0xbd, 0x5a, 0x49, 0xec, 0x87, 0x5f, 0xcb, 0xd6, - 0x9d, 0x38, 0x9b, 0xf6, 0xaa, 0x54, 0xb3, 0xb2, 0x33, 0x2e, 0x0c, 0x4f, 0xca, 0x47, 0x2e, 0xac, - 0x98, 0x72, 0x5d, 0x8b, 0x95, 0x96, 0x67, 0x56, 0x7a, 0x93, 0x2b, 0x6c, 0x8f, 0x0b, 0xc2, 0x93, - 0xb2, 0xd1, 0x4f, 0x60, 0x2d, 0x04, 0x4e, 0xee, 0xcc, 0x35, 0x10, 0x9e, 0xaa, 0xf3, 0x2d, 0xbe, - 0x3d, 0x95, 0x0a, 0x7f, 0x8a, 0x04, 0x64, 0x42, 0xd1, 0x0e, 0x66, 0x4b, 0x45, 0x34, 0xf6, 0xef, - 0x66, 0x3b, 0x45, 0x9c, 0xfd, 0xcd, 0xe4, 0x4c, 0x89, 0xf6, 0x46, 0x39, 0x4e, 0xa4, 0x6c, 0x74, - 0x01, 0x15, 0xdd, 0x71, 0x5c, 0x5f, 0x0f, 0xb6, 0xf8, 0x05, 0xa1, 0x6a, 0x7b, 0x66, 0x55, 0xdb, - 0xb1, 0x8c, 0xb1, 0x19, 0x96, 0xc0, 0xe0, 0xa4, 0x2a, 0xf4, 0x14, 0x96, 0xdc, 0xa7, 0x0e, 0xa1, - 0x98, 0x9c, 0x12, 0x4a, 0x1c, 0x7e, 0xe5, 0xab, 0x0a, 0xed, 0xdf, 0xcc, 0xa8, 0x3d, 0xc5, 0x1c, - 0xa7, 0x74, 0x1a, 0xce, 0xf0, 0xb8, 0x16, 0x7e, 0xc7, 0x3d, 0xb5, 0x1c, 0xdd, 0xb6, 0x7e, 0x41, - 0x28, 0xab, 0x2d, 0xc6, 0x77, 0xdc, 0x7b, 0x11, 0x14, 0x27, 0x28, 0xd0, 0xb7, 0xa0, 0x62, 0xd8, - 0x3d, 0xe6, 0x13, 0x2a, 0x3a, 0xc4, 0x92, 0xa8, 0xa0, 0xe8, 0x7c, 0x3b, 0x31, 0x0a, 0x27, 0xe9, - 0xd6, 0xbe, 0x0d, 0x95, 0xff, 0x73, 0x2e, 0xf2, 0xb9, 0x3a, 0xee, 0xd0, 0x99, 0xe6, 0xea, 0xdf, - 0x72, 0xb0, 0x98, 0x76, 0x43, 0xb4, 0x8d, 0x29, 0x53, 0x1f, 0x12, 0xc2, 0x5e, 0x99, 0x9f, 0xda, - 0x2b, 0x65, 0x4b, 0x9a, 0xff, 0x2c, 0x2d, 0x69, 0x0b, 0x40, 0xf7, 0xac, 0xb0, 0x1b, 0x05, 0xdd, - 0x2d, 0xea, 0x27, 0xf1, 0xa5, 0x1c, 0x27, 0xa8, 0x78, 0xc0, 0x0c, 0xd7, 0xf1, 0xa9, 0x6b, 0xdb, - 0x84, 0x8a, 0x0e, 0x56, 0x0a, 0x02, 0xb6, 0x13, 0x41, 0x71, 0x82, 0x82, 0xdf, 0x71, 0x4f, 0x6c, - 0xd7, 0x38, 0x17, 0x2e, 0x08, 0xab, 0x4f, 0xf4, 0xae, 0x52, 0x70, 0xc7, 0xd5, 0x26, 0xb0, 0xf8, - 0x0a, 0x0e, 0xf5, 0x10, 0xd2, 0xb7, 0x52, 0x74, 0x37, 0x70, 0x80, 0x12, 0x5d, 0x1b, 0x67, 0x3b, - 0xbc, 0x7a, 0x0b, 0xca, 0xd8, 0x75, 0xfd, 0x23, 0xdd, 0x3f, 0x63, 0xa8, 0x01, 0x05, 0x8f, 0xff, - 0x90, 0x4f, 0x0e, 0xe2, 0x2d, 0x46, 0x60, 0x70, 0x00, 0x57, 0x7f, 0xab, 0xc0, 0xab, 0x53, 0x5f, - 0x00, 0xb8, 0x23, 0x8d, 0xe8, 0x4b, 0x9a, 0x14, 0x39, 0x32, 0xa6, 0xc3, 0x09, 0x2a, 0x3e, 0xfe, - 0x53, 0xcf, 0x06, 0xe3, 0xe3, 0x3f, 0xa5, 0x0d, 0xa7, 0x69, 0xd5, 0xff, 0xe6, 0xa0, 0x78, 0xec, - 0xeb, 0x7e, 0x8f, 0xa1, 0x27, 0x50, 0xe2, 0x55, 0x68, 0xea, 0xbe, 0x2e, 0x34, 0x67, 0x7e, 0x55, - 0x0b, 0xd7, 0xa8, 0x78, 0xf2, 0x85, 0x10, 0x1c, 0x49, 0xe4, 0x57, 0x5e, 0x26, 0xf4, 0x48, 0xf3, - 0xa2, 0xd6, 0x15, 0x68, 0xc7, 0x12, 0xcb, 0xd7, 0xfe, 0x2e, 0x61, 0x4c, 0xef, 0x84, 0x39, 0x1b, - 0xad, 0xfd, 0x07, 0x01, 0x18, 0x87, 0x78, 0xf4, 0x0e, 0x14, 0x29, 0xd1, 0x59, 0xb4, 0x8c, 0xd4, - 0x43, 0x91, 0x58, 0x40, 0x2f, 0x87, 0x8d, 0x05, 0x29, 0x5c, 0x7c, 0x63, 0x49, 0x8d, 0x1e, 0xc3, - 0x0d, 0x93, 0xf8, 0xba, 0x65, 0x07, 0x3b, 0x48, 0xe6, 0xf7, 0x8d, 0x40, 0x58, 0x3b, 0x60, 0xd5, - 0x2a, 0xdc, 0x26, 0xf9, 0x81, 0x43, 0x81, 0xbc, 0xde, 0x0c, 0xd7, 0x24, 0x22, 0x9f, 0x0b, 0x71, - 0xbd, 0xed, 0xb8, 0x26, 0xc1, 0x02, 0xa3, 0x3e, 0x53, 0xa0, 0x12, 0x48, 0xda, 0xd1, 0x7b, 0x8c, - 0xa0, 0xcd, 0xe8, 0x14, 0x41, 0xb8, 0xc3, 0x01, 0x39, 0xff, 0xde, 0xc0, 0x23, 0x97, 0xc3, 0x46, - 0x59, 0x90, 0xf1, 0x8f, 0xe8, 0x00, 0x09, 0x1f, 0xe5, 0xae, 0xf1, 0xd1, 0xeb, 0x50, 0x10, 0xfb, - 0x9e, 0x74, 0x66, 0xb4, 0xde, 0x89, 0x9d, 0x10, 0x07, 0x38, 0xf5, 0x0f, 0x39, 0xa8, 0xa6, 0x0e, - 0x97, 0x61, 0xc5, 0x8a, 0xee, 0x70, 0xb9, 0x0c, 0xef, 0x02, 0xd3, 0x1f, 0x3a, 0x7f, 0x04, 0x45, - 0x83, 0x9f, 0x2f, 0x7c, 0x69, 0xde, 0x9c, 0x25, 0x14, 0xc2, 0x33, 0x71, 0x26, 0x89, 0x4f, 0x86, - 0xa5, 0x40, 0xb4, 0x07, 0x2b, 0x94, 0xf8, 0x74, 0xb0, 0x7d, 0xea, 0x13, 0x9a, 0x5c, 0x3a, 0x0b, - 0xf1, 0x12, 0x82, 0xc7, 0x09, 0xf0, 0x24, 0x8f, 0x6a, 0xc3, 0x3c, 0x5f, 0x10, 0xb8, 0xdb, 0x59, - 0xea, 0x69, 0x2d, 0x72, 0x7b, 0xc8, 0x1c, 0xe2, 0xb9, 0x77, 0x1c, 0xdd, 0x71, 0x83, 0x64, 0x2f, - 0xc4, 0xde, 0x79, 0xc0, 0x81, 0x38, 0xc0, 0xdd, 0x59, 0xe5, 0x17, 0xd1, 0xdf, 0x3c, 0x6f, 0xcc, - 0x3d, 0x7b, 0xde, 0x98, 0xfb, 0xe8, 0xb9, 0xbc, 0x94, 0xfe, 0x18, 0xca, 0xf1, 0x3a, 0xf2, 0x39, - 0xab, 0x54, 0x7f, 0x0a, 0x25, 0x9e, 0x49, 0xe1, 0x1a, 0x7d, 0xcd, 0xf0, 0x48, 0xb7, 0xf5, 0x5c, - 0x96, 0xb6, 0xae, 0x6e, 0x41, 0xf0, 0xf6, 0xcc, 0x3b, 0xa1, 0xe5, 0x93, 0x6e, 0xaa, 0x13, 0xee, - 0x73, 0x00, 0x0e, 0xe0, 0x89, 0x7b, 0xf8, 0xaf, 0x15, 0x00, 0x71, 0xdf, 0xd8, 0xed, 0xf3, 0x3b, - 0xe2, 0x3a, 0xcc, 0xf3, 0x16, 0x3b, 0x6e, 0x98, 0x28, 0x01, 0x81, 0x41, 0x0f, 0xa1, 0xe8, 0x8a, - 0x35, 0x45, 0x3e, 0x50, 0xbe, 0x35, 0x35, 0x6b, 0xe4, 0xbf, 0x95, 0x9a, 0x58, 0x7f, 0xba, 0x7b, - 0xe1, 0x13, 0x87, 0xdb, 0x18, 0x67, 0x4c, 0xb0, 0xeb, 0x60, 0x29, 0x4c, 0x7b, 0xe3, 0xc5, 0xcb, - 0xfa, 0xdc, 0xc7, 0x2f, 0xeb, 0x73, 0xff, 0x7c, 0x59, 0x9f, 0xfb, 0x60, 0x54, 0x57, 0x5e, 0x8c, - 0xea, 0xca, 0xc7, 0xa3, 0xba, 0xf2, 0xef, 0x51, 0x5d, 0x79, 0xf6, 0x49, 0x7d, 0xee, 0x71, 0xae, - 0xbf, 0xf9, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb1, 0xe8, 0xc1, 0x2f, 0x98, 0x1b, 0x00, 0x00, + // 2183 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x19, 0x4b, 0x6c, 0x23, 0x49, + 0x35, 0x6d, 0xc7, 0x1e, 0xfb, 0x39, 0xce, 0xa7, 0x36, 0x03, 0xde, 0x48, 0xd8, 0xd9, 0xde, 0x15, + 0xca, 0xc2, 0xac, 0x4d, 0xb2, 0xb0, 0x1a, 0x06, 0x18, 0x48, 0xc7, 0x99, 0x28, 0xda, 0xc9, 0x24, + 0xaa, 0xec, 0x0c, 0x62, 0x18, 0x21, 0x3a, 0xdd, 0x15, 0xa7, 0x49, 0xbb, 0xbb, 0xa9, 0x6a, 0x7b, + 0x62, 0xf6, 0xc0, 0x4a, 0x80, 0xc4, 0x01, 0xa1, 0x39, 0x72, 0x40, 0x68, 0x47, 0x70, 0xe3, 0xc6, + 0x9d, 0x1b, 0x12, 0x73, 0x5c, 0x89, 0x0b, 0x07, 0x64, 0x31, 0xde, 0x03, 0x47, 0xee, 0x39, 0xa1, + 0xaa, 0xae, 0xfe, 0xd9, 0xf1, 0xa6, 0xcd, 0xee, 0x61, 0x4f, 0x71, 0xbf, 0x7f, 0xbd, 0xf7, 0xea, + 0x7d, 0x2a, 0x70, 0x70, 0x7e, 0x9b, 0x35, 0x2d, 0xb7, 0x75, 0xde, 0x3b, 0x21, 0xd4, 0x21, 0x3e, + 0x61, 0xad, 0x3e, 0x71, 0x4c, 0x97, 0xb6, 0x24, 0x42, 0xf7, 0xac, 0xae, 0x6e, 0x9c, 0x59, 0x0e, + 0xa1, 0x83, 0x96, 0x77, 0xde, 0xe1, 0x00, 0xd6, 0xea, 0x12, 0x5f, 0x6f, 0xf5, 0x37, 0x5b, 0x1d, + 0xe2, 0x10, 0xaa, 0xfb, 0xc4, 0x6c, 0x7a, 0xd4, 0xf5, 0x5d, 0xf4, 0x46, 0xc0, 0xd5, 0x4c, 0x72, + 0x35, 0xbd, 0xf3, 0x0e, 0x07, 0xb0, 0x26, 0xe7, 0x6a, 0xf6, 0x37, 0xd7, 0xde, 0xea, 0x58, 0xfe, + 0x59, 0xef, 0xa4, 0x69, 0xb8, 0xdd, 0x56, 0xc7, 0xed, 0xb8, 0x2d, 0xc1, 0x7c, 0xd2, 0x3b, 0x15, + 0x5f, 0xe2, 0x43, 0xfc, 0x0a, 0x84, 0xae, 0x4d, 0x35, 0x85, 0xf6, 0x1c, 0xdf, 0xea, 0x92, 0x71, + 0x2b, 0xd6, 0xde, 0xb9, 0x8e, 0x81, 0x19, 0x67, 0xa4, 0xab, 0x4f, 0xf0, 0xbd, 0x3d, 0x8d, 0xaf, + 0xe7, 0x5b, 0x76, 0xcb, 0x72, 0x7c, 0xe6, 0xd3, 0x71, 0x26, 0xf5, 0xef, 0x79, 0x28, 0x6d, 0x1f, + 0xed, 0xef, 0x51, 0xb7, 0xe7, 0xa1, 0x75, 0x98, 0x77, 0xf4, 0x2e, 0xa9, 0x29, 0xeb, 0xca, 0x46, + 0x59, 0x5b, 0x78, 0x31, 0x6c, 0xcc, 0x8d, 0x86, 0x8d, 0xf9, 0x07, 0x7a, 0x97, 0x60, 0x81, 0x41, + 0x36, 0x94, 0xfa, 0x84, 0x32, 0xcb, 0x75, 0x58, 0x2d, 0xb7, 0x9e, 0xdf, 0xa8, 0x6c, 0xdd, 0x6d, + 0x66, 0x71, 0x5a, 0x53, 0x28, 0x78, 0x14, 0xb0, 0xde, 0x73, 0x69, 0xdb, 0x62, 0x86, 0xdb, 0x27, + 0x74, 0xa0, 0x2d, 0x4b, 0x2d, 0x25, 0x89, 0x64, 0x38, 0xd2, 0x80, 0x7e, 0xa9, 0xc0, 0xb2, 0x47, + 0xc9, 0x29, 0xa1, 0x94, 0x98, 0x12, 0x5f, 0xcb, 0xaf, 0x2b, 0x9f, 0x81, 0xda, 0x9a, 0x54, 0xbb, + 0x7c, 0x34, 0x26, 0x1f, 0x4f, 0x68, 0x44, 0x7f, 0x54, 0x60, 0x8d, 0x11, 0xda, 0x27, 0x74, 0xdb, + 0x34, 0x29, 0x61, 0x4c, 0x1b, 0xec, 0xd8, 0x16, 0x71, 0xfc, 0x9d, 0xfd, 0x36, 0x66, 0xb5, 0x79, + 0xe1, 0x87, 0xef, 0x66, 0x33, 0xe8, 0x78, 0x9a, 0x1c, 0x4d, 0x95, 0x16, 0xad, 0x4d, 0x25, 0x61, + 0xf8, 0x13, 0xcc, 0x50, 0x4f, 0x61, 0x21, 0x0c, 0xe4, 0x7d, 0x8b, 0xf9, 0xe8, 0x11, 0x14, 0x3b, + 0xfc, 0x83, 0xd5, 0x14, 0x61, 0x60, 0x33, 0x9b, 0x81, 0xa1, 0x0c, 0x6d, 0x51, 0xda, 0x53, 0x14, + 0x9f, 0x0c, 0x4b, 0x69, 0xea, 0x5f, 0x73, 0x50, 0xd9, 0x3e, 0xda, 0xc7, 0x84, 0xb9, 0x3d, 0x6a, + 0x90, 0x0c, 0x49, 0xb3, 0x05, 0xc0, 0xff, 0x32, 0x4f, 0x37, 0x88, 0x59, 0xcb, 0xad, 0x2b, 0x1b, + 0x25, 0x0d, 0x49, 0x3a, 0x78, 0x10, 0x61, 0x70, 0x82, 0x8a, 0x4b, 0x3d, 0xb7, 0x1c, 0x53, 0x44, + 0x3b, 0x21, 0xf5, 0x5d, 0xcb, 0x31, 0xb1, 0xc0, 0xa0, 0xfb, 0x50, 0xe8, 0x13, 0x7a, 0xc2, 0xfd, + 0xcf, 0x13, 0xe2, 0xab, 0xd9, 0x8e, 0xf7, 0x88, 0xb3, 0x68, 0xe5, 0xd1, 0xb0, 0x51, 0x10, 0x3f, + 0x71, 0x20, 0x04, 0x35, 0x01, 0xd8, 0x99, 0x4b, 0x7d, 0x61, 0x4e, 0xad, 0xb0, 0x9e, 0xdf, 0x28, + 0x6b, 0x8b, 0xdc, 0xbe, 0xe3, 0x08, 0x8a, 0x13, 0x14, 0xe8, 0x36, 0x2c, 0x30, 0xcb, 0xe9, 0xf4, + 0x6c, 0x9d, 0x72, 0x40, 0xad, 0x28, 0xec, 0x5c, 0x95, 0x76, 0x2e, 0x1c, 0x27, 0x70, 0x38, 0x45, + 0xa9, 0xfe, 0x45, 0x81, 0xa5, 0x84, 0xff, 0x44, 0xac, 0x6e, 0xc3, 0x42, 0x27, 0x91, 0xa9, 0xd2, + 0x97, 0x91, 0xb4, 0x64, 0x16, 0xe3, 0x14, 0x25, 0x22, 0x50, 0xa6, 0x52, 0x52, 0x78, 0x23, 0x37, + 0x33, 0x07, 0x3a, 0xb4, 0x21, 0xd6, 0x94, 0x00, 0x32, 0x1c, 0x4b, 0x56, 0xff, 0xa3, 0x88, 0xa0, + 0x87, 0x77, 0x14, 0x6d, 0x24, 0xea, 0x80, 0x22, 0x9c, 0xb5, 0x30, 0xe5, 0x0e, 0x5f, 0x73, 0x79, + 0x72, 0x9f, 0x8b, 0xcb, 0x73, 0xa7, 0xf4, 0xbb, 0x0f, 0x1b, 0x73, 0x1f, 0xfc, 0x6b, 0x7d, 0x4e, + 0xfd, 0x38, 0x07, 0xd5, 0x36, 0xb1, 0x89, 0x4f, 0x0e, 0x3d, 0x5f, 0x9c, 0xe0, 0x1e, 0xa0, 0x0e, + 0xd5, 0x0d, 0x72, 0x44, 0xa8, 0xe5, 0x9a, 0xc7, 0xc4, 0x70, 0x1d, 0x93, 0x89, 0x10, 0xe5, 0xb5, + 0x2f, 0x8c, 0x86, 0x0d, 0xb4, 0x37, 0x81, 0xc5, 0x57, 0x70, 0x20, 0x1b, 0xaa, 0x1e, 0x15, 0xbf, + 0x2d, 0x5f, 0x16, 0x50, 0x9e, 0xb8, 0x6f, 0x67, 0x3b, 0xfb, 0x51, 0x92, 0x55, 0x5b, 0x19, 0x0d, + 0x1b, 0xd5, 0x14, 0x08, 0xa7, 0x85, 0xa3, 0xef, 0xc1, 0xb2, 0x4b, 0xbd, 0x33, 0xdd, 0x69, 0x13, + 0x8f, 0x38, 0x26, 0x71, 0x7c, 0x26, 0x2e, 0x53, 0x49, 0x5b, 0xe5, 0x65, 0xef, 0x70, 0x0c, 0x87, + 0x27, 0xa8, 0xd1, 0x63, 0x58, 0xf1, 0xa8, 0xeb, 0xe9, 0x1d, 0x9d, 0x4b, 0x3c, 0x72, 0x6d, 0xcb, + 0x18, 0x88, 0xcb, 0x56, 0xd6, 0x6e, 0x8d, 0x86, 0x8d, 0x95, 0xa3, 0x71, 0xe4, 0xe5, 0xb0, 0xf1, + 0x8a, 0x70, 0x1d, 0x87, 0xc4, 0x48, 0x3c, 0x29, 0x46, 0xdd, 0x87, 0x52, 0xbb, 0x47, 0x05, 0x04, + 0x7d, 0x07, 0x4a, 0xa6, 0xfc, 0x2d, 0xbd, 0xfa, 0x5a, 0xd8, 0x13, 0x42, 0x9a, 0xcb, 0x61, 0xa3, + 0xca, 0x5b, 0x5f, 0x33, 0x04, 0xe0, 0x88, 0x45, 0x7d, 0x02, 0xd5, 0xdd, 0x0b, 0xcf, 0xa5, 0x7e, + 0x18, 0xaf, 0x2f, 0x43, 0x91, 0x08, 0x80, 0x90, 0x56, 0x8a, 0x0b, 0x59, 0x40, 0x86, 0x25, 0x16, + 0xbd, 0x0e, 0x05, 0x72, 0xa1, 0x1b, 0xbe, 0xac, 0x48, 0x55, 0x49, 0x56, 0xd8, 0xe5, 0x40, 0x1c, + 0xe0, 0xd4, 0x43, 0x80, 0x3d, 0x12, 0x89, 0xde, 0x86, 0xa5, 0xf0, 0x4e, 0xa4, 0xaf, 0xea, 0x17, + 0x25, 0xf3, 0x12, 0x4e, 0xa3, 0xf1, 0x38, 0xbd, 0xfa, 0x04, 0xca, 0xe2, 0x3a, 0xf3, 0x4a, 0xc6, + 0x4d, 0x10, 0xb7, 0x59, 0x4a, 0x89, 0x4c, 0x10, 0x14, 0x38, 0xc0, 0x45, 0xa5, 0x30, 0x37, 0xad, + 0x14, 0x26, 0xb2, 0xd7, 0x86, 0x6a, 0xc0, 0x1b, 0x56, 0xe7, 0x4c, 0x1a, 0x6e, 0x41, 0x29, 0x34, + 0x53, 0x6a, 0x89, 0xba, 0x72, 0x28, 0x08, 0x47, 0x14, 0x09, 0x6d, 0x67, 0x90, 0x2a, 0x4d, 0xd9, + 0x94, 0xbd, 0x09, 0x37, 0x64, 0x71, 0x90, 0xba, 0x96, 0x24, 0xd9, 0x8d, 0xd0, 0x67, 0x21, 0x3e, + 0xa1, 0xe9, 0xe7, 0x50, 0x9b, 0xd6, 0xca, 0x3f, 0x45, 0xf1, 0xcc, 0x6e, 0x8a, 0xfa, 0x5b, 0x05, + 0x96, 0x93, 0x92, 0xb2, 0x87, 0x2f, 0xbb, 0x92, 0xeb, 0x9b, 0x5e, 0xc2, 0x23, 0x7f, 0x50, 0x60, + 0x35, 0x75, 0xb4, 0x99, 0x22, 0x3e, 0x83, 0x51, 0xc9, 0xe4, 0xc8, 0xcf, 0x90, 0x1c, 0xff, 0xc8, + 0x41, 0xf5, 0xbe, 0x7e, 0x42, 0xec, 0x63, 0x62, 0x13, 0xc3, 0x77, 0x29, 0x7a, 0x1f, 0x2a, 0x5d, + 0xdd, 0x37, 0xce, 0x04, 0x34, 0x1c, 0x4b, 0xda, 0xd9, 0xca, 0x5f, 0x4a, 0x52, 0xf3, 0x20, 0x16, + 0xb3, 0xeb, 0xf8, 0x74, 0xa0, 0xbd, 0x22, 0x4d, 0xaa, 0x24, 0x30, 0x38, 0xa9, 0x4d, 0xcc, 0x92, + 0xe2, 0x7b, 0xf7, 0xc2, 0xe3, 0xf5, 0x7f, 0xf6, 0x11, 0x36, 0x65, 0x02, 0x26, 0x3f, 0xed, 0x59, + 0x94, 0x74, 0x89, 0xe3, 0xc7, 0xb3, 0xe4, 0xc1, 0x98, 0x7c, 0x3c, 0xa1, 0x71, 0xed, 0x2e, 0x2c, + 0x8f, 0x1b, 0x8f, 0x96, 0x21, 0x7f, 0x4e, 0x06, 0x41, 0xbc, 0x30, 0xff, 0x89, 0x56, 0xa1, 0xd0, + 0xd7, 0xed, 0x9e, 0xbc, 0x8d, 0x38, 0xf8, 0xb8, 0x93, 0xbb, 0xad, 0xa8, 0x7f, 0x52, 0xa0, 0x36, + 0xcd, 0x10, 0xf4, 0xa5, 0x84, 0x20, 0xad, 0x22, 0xad, 0xca, 0xbf, 0x4b, 0x06, 0x81, 0xd4, 0x5d, + 0x28, 0xb9, 0x1e, 0x9f, 0xfe, 0x5d, 0x2a, 0xa3, 0xfe, 0x66, 0x18, 0xc9, 0x43, 0x09, 0xbf, 0x1c, + 0x36, 0x6e, 0xa6, 0xc4, 0x87, 0x08, 0x1c, 0xb1, 0x22, 0x15, 0x8a, 0xc2, 0x1e, 0xde, 0x4f, 0x78, + 0xe7, 0x07, 0x5e, 0x5b, 0x1f, 0x09, 0x08, 0x96, 0x18, 0xf5, 0x7d, 0x28, 0xf1, 0xc1, 0xe6, 0x80, + 0xf8, 0x3a, 0x4f, 0x20, 0x46, 0xec, 0xd3, 0xfb, 0x96, 0x73, 0x2e, 0x4d, 0x8b, 0x12, 0xe8, 0x58, + 0xc2, 0x71, 0x44, 0x71, 0x55, 0x89, 0xcd, 0xcd, 0x58, 0x62, 0xff, 0x9c, 0x83, 0x0a, 0xd7, 0x1e, + 0x56, 0xed, 0x6f, 0x41, 0xd5, 0x4e, 0x9e, 0x49, 0x5a, 0x71, 0x53, 0x0a, 0x4c, 0x67, 0x29, 0x4e, + 0xd3, 0x72, 0xe6, 0x53, 0x8b, 0xd8, 0x66, 0xc4, 0x9c, 0x4b, 0x33, 0xdf, 0x4b, 0x22, 0x71, 0x9a, + 0x96, 0xdf, 0xc5, 0xa7, 0x3c, 0xda, 0xb2, 0xf3, 0x46, 0x77, 0xf1, 0xfb, 0x1c, 0x88, 0x03, 0xdc, + 0x55, 0x27, 0x9e, 0x9f, 0xed, 0xc4, 0xe8, 0x0e, 0x2c, 0xf2, 0xf6, 0xe8, 0xf6, 0xfc, 0x70, 0x3c, + 0x29, 0x88, 0x46, 0x8a, 0x46, 0xc3, 0xc6, 0xe2, 0x7b, 0x29, 0x0c, 0x1e, 0xa3, 0x54, 0x7f, 0x01, + 0x00, 0x87, 0x27, 0x3f, 0x21, 0x46, 0x10, 0xad, 0xeb, 0xc7, 0x79, 0x5e, 0x6f, 0xe5, 0x16, 0x29, + 0x46, 0xdf, 0xdc, 0x58, 0xbd, 0x4d, 0xe0, 0x70, 0x8a, 0x12, 0xb5, 0xa0, 0x1c, 0x8d, 0xf8, 0xb2, + 0x96, 0xac, 0x48, 0xb6, 0x72, 0xb4, 0x07, 0xe0, 0x98, 0x26, 0x95, 0x3a, 0xf3, 0xd7, 0xa6, 0x8e, + 0x06, 0xf9, 0x9e, 0x65, 0x8a, 0xa3, 0x97, 0xb5, 0xaf, 0x85, 0xe9, 0xff, 0x70, 0xbf, 0x7d, 0x39, + 0x6c, 0xbc, 0x36, 0x6d, 0x39, 0xf6, 0x07, 0x1e, 0x61, 0xcd, 0x87, 0xfb, 0x6d, 0xcc, 0x99, 0xaf, + 0x0a, 0x46, 0x71, 0xc6, 0x60, 0x6c, 0x01, 0xc8, 0x53, 0x73, 0xee, 0x1b, 0x41, 0x20, 0xc2, 0x75, + 0x67, 0x2f, 0xc2, 0xe0, 0x04, 0x15, 0x62, 0xb0, 0x62, 0x50, 0x22, 0x7e, 0xf3, 0x70, 0x31, 0x5f, + 0xef, 0x7a, 0xb5, 0x92, 0x98, 0x0f, 0xbf, 0x92, 0xad, 0x3a, 0x71, 0x36, 0xed, 0x55, 0xa9, 0x66, + 0x65, 0x67, 0x5c, 0x18, 0x9e, 0x94, 0x8f, 0x5c, 0x58, 0x31, 0xe5, 0xb8, 0x16, 0x2b, 0x2d, 0xcf, + 0xac, 0xf4, 0x26, 0x57, 0xd8, 0x1e, 0x17, 0x84, 0x27, 0x65, 0xa3, 0x1f, 0xc1, 0x5a, 0x08, 0x9c, + 0x9c, 0x99, 0x6b, 0x20, 0x3c, 0x55, 0xe7, 0x53, 0x7c, 0x7b, 0x2a, 0x15, 0xfe, 0x04, 0x09, 0xc8, + 0x84, 0xa2, 0x1d, 0xf4, 0x96, 0x8a, 0x28, 0xec, 0xdf, 0xce, 0x76, 0x8a, 0x38, 0xfb, 0x9b, 0xc9, + 0x9e, 0x12, 0xcd, 0x8d, 0xb2, 0x9d, 0x48, 0xd9, 0xe8, 0x02, 0x2a, 0xba, 0xe3, 0xb8, 0xbe, 0x1e, + 0x4c, 0xf1, 0x0b, 0x42, 0xd5, 0xf6, 0xcc, 0xaa, 0xb6, 0x63, 0x19, 0x63, 0x3d, 0x2c, 0x81, 0xc1, + 0x49, 0x55, 0xe8, 0x29, 0x2c, 0xb9, 0x4f, 0x1d, 0x42, 0x31, 0x39, 0x25, 0x94, 0x38, 0x7c, 0xe5, + 0xab, 0x0a, 0xed, 0x5f, 0xcf, 0xa8, 0x3d, 0xc5, 0x1c, 0xa7, 0x74, 0x1a, 0xce, 0xf0, 0xb8, 0x16, + 0xbe, 0x1d, 0x9f, 0x5a, 0x8e, 0x6e, 0x5b, 0x3f, 0x23, 0x94, 0xd5, 0x16, 0xe3, 0xed, 0xf8, 0x5e, + 0x04, 0xc5, 0x09, 0x0a, 0xf4, 0x0d, 0xa8, 0x18, 0x76, 0x8f, 0xf9, 0x24, 0x58, 0x8e, 0x97, 0xc4, + 0x0d, 0x8a, 0xce, 0xb7, 0x13, 0xa3, 0x70, 0x92, 0x6e, 0xed, 0x9b, 0x50, 0xf9, 0x3f, 0xfb, 0x22, + 0xef, 0xab, 0xe3, 0x0e, 0x9d, 0xa9, 0xaf, 0xfe, 0x2d, 0x07, 0x8b, 0x69, 0x37, 0x44, 0xd3, 0x98, + 0x32, 0xf5, 0x09, 0x22, 0xac, 0x95, 0xf9, 0xa9, 0xb5, 0x52, 0x96, 0xa4, 0xf9, 0x4f, 0x53, 0x92, + 0xb6, 0x00, 0x74, 0xcf, 0x0a, 0xab, 0x51, 0x50, 0xdd, 0xa2, 0x7a, 0x12, 0x2f, 0xe5, 0x38, 0x41, + 0xc5, 0x03, 0x66, 0xb8, 0x8e, 0x4f, 0x5d, 0xdb, 0x26, 0x54, 0x54, 0xb0, 0x52, 0x10, 0xb0, 0x9d, + 0x08, 0x8a, 0x13, 0x14, 0x7c, 0xc7, 0x3d, 0xb1, 0x5d, 0xe3, 0x5c, 0xb8, 0x20, 0xbc, 0x7d, 0xa2, + 0x76, 0x95, 0x82, 0x1d, 0x57, 0x9b, 0xc0, 0xe2, 0x2b, 0x38, 0xd4, 0x43, 0x48, 0x6f, 0xa5, 0xe8, + 0x6e, 0xe0, 0x00, 0x25, 0x5a, 0x1b, 0x67, 0x3b, 0xbc, 0x7a, 0x0b, 0xca, 0xd8, 0x75, 0xfd, 0x23, + 0xdd, 0x3f, 0x63, 0xa8, 0x01, 0x05, 0x8f, 0xff, 0x90, 0x4f, 0x0e, 0xe2, 0x15, 0x47, 0x60, 0x70, + 0x00, 0x57, 0x7f, 0xa3, 0xc0, 0xab, 0x53, 0x5f, 0x00, 0xb8, 0x23, 0x8d, 0xe8, 0x4b, 0x9a, 0x14, + 0x39, 0x32, 0xa6, 0xc3, 0x09, 0x2a, 0xde, 0xfe, 0x53, 0xcf, 0x06, 0xe3, 0xed, 0x3f, 0xa5, 0x0d, + 0xa7, 0x69, 0xd5, 0xff, 0xe6, 0xa0, 0x78, 0xec, 0xeb, 0x7e, 0x8f, 0xa1, 0x27, 0x50, 0xe2, 0xb7, + 0xd0, 0xd4, 0x7d, 0x5d, 0x68, 0xce, 0xfc, 0x1e, 0x17, 0x8e, 0x51, 0x71, 0xe7, 0x0b, 0x21, 0x38, + 0x92, 0xc8, 0x57, 0x5e, 0x26, 0xf4, 0x48, 0xf3, 0xa2, 0xd2, 0x15, 0x68, 0xc7, 0x12, 0xcb, 0xc7, + 0xfe, 0x2e, 0x61, 0x4c, 0xef, 0x84, 0x39, 0x1b, 0x8d, 0xfd, 0x07, 0x01, 0x18, 0x87, 0x78, 0xf4, + 0x0e, 0x14, 0x29, 0xd1, 0x59, 0x34, 0x8c, 0xd4, 0x43, 0x91, 0x58, 0x40, 0x2f, 0x87, 0x8d, 0x05, + 0x29, 0x5c, 0x7c, 0x63, 0x49, 0x8d, 0x1e, 0xc3, 0x0d, 0x93, 0xf8, 0xba, 0x65, 0x07, 0x33, 0x48, + 0xe6, 0xf7, 0x8d, 0x40, 0x58, 0x3b, 0x60, 0xd5, 0x2a, 0xdc, 0x26, 0xf9, 0x81, 0x43, 0x81, 0xfc, + 0xbe, 0x19, 0xae, 0x19, 0x3c, 0xb6, 0x15, 0xe2, 0xfb, 0xb6, 0xe3, 0x9a, 0x04, 0x0b, 0x8c, 0xfa, + 0x4c, 0x81, 0x4a, 0x20, 0x69, 0x47, 0xef, 0x31, 0x82, 0x36, 0xa3, 0x53, 0x04, 0xe1, 0x0e, 0x1b, + 0xe4, 0xfc, 0x7b, 0x03, 0x8f, 0x5c, 0x0e, 0x1b, 0x65, 0x41, 0xc6, 0x3f, 0xa2, 0x03, 0x24, 0x7c, + 0x94, 0xbb, 0xc6, 0x47, 0xaf, 0x43, 0x41, 0xcc, 0x7b, 0xd2, 0x99, 0xd1, 0x78, 0x27, 0x66, 0x42, + 0x1c, 0xe0, 0xd4, 0xdf, 0xe7, 0xa0, 0x9a, 0x3a, 0x5c, 0x86, 0x11, 0x2b, 0xda, 0xe1, 0x72, 0x19, + 0xde, 0x05, 0xa6, 0x3f, 0x91, 0xfe, 0x00, 0x8a, 0x06, 0x3f, 0x5f, 0xf8, 0x46, 0xbd, 0x39, 0x4b, + 0x28, 0x84, 0x67, 0xe2, 0x4c, 0x12, 0x9f, 0x0c, 0x4b, 0x81, 0x68, 0x0f, 0x56, 0x28, 0xf1, 0xe9, + 0x60, 0xfb, 0xd4, 0x27, 0x34, 0x39, 0x74, 0x16, 0xe2, 0x21, 0x04, 0x8f, 0x13, 0xe0, 0x49, 0x1e, + 0xd5, 0x86, 0x79, 0x3e, 0x20, 0x70, 0xb7, 0xb3, 0xd4, 0xd3, 0x5a, 0xe4, 0xf6, 0x90, 0x39, 0xc4, + 0x73, 0xef, 0x38, 0xba, 0xe3, 0x06, 0xc9, 0x5e, 0x88, 0xbd, 0xf3, 0x80, 0x03, 0x71, 0x80, 0xbb, + 0xb3, 0xca, 0x17, 0xd1, 0x5f, 0x3f, 0x6f, 0xcc, 0x3d, 0x7b, 0xde, 0x98, 0xfb, 0xf0, 0xb9, 0x5c, + 0x4a, 0x7f, 0x08, 0xe5, 0x78, 0x1c, 0xf9, 0x8c, 0x55, 0xaa, 0x3f, 0x86, 0x12, 0xcf, 0xa4, 0x70, + 0x8c, 0xbe, 0xa6, 0x79, 0xa4, 0xcb, 0x7a, 0x2e, 0x4b, 0x59, 0x57, 0xb7, 0x20, 0x78, 0xb5, 0xe6, + 0x95, 0xd0, 0xf2, 0x49, 0x37, 0x55, 0x09, 0xf7, 0x39, 0x00, 0x07, 0xf0, 0xc4, 0x1e, 0xfe, 0x2b, + 0x05, 0x40, 0xec, 0x1b, 0xbb, 0x7d, 0xbe, 0x23, 0xae, 0xc3, 0x3c, 0x2f, 0xb1, 0xe3, 0x86, 0x89, + 0x2b, 0x20, 0x30, 0xe8, 0x21, 0x14, 0x5d, 0x31, 0xa6, 0xc8, 0x07, 0xca, 0xb7, 0xa6, 0x66, 0x8d, + 0xfc, 0x87, 0x54, 0x13, 0xeb, 0x4f, 0x77, 0x2f, 0x7c, 0xe2, 0x70, 0x1b, 0xe3, 0x8c, 0x09, 0x66, + 0x1d, 0x2c, 0x85, 0x69, 0x6f, 0xbc, 0x78, 0x59, 0x9f, 0xfb, 0xe8, 0x65, 0x7d, 0xee, 0x9f, 0x2f, + 0xeb, 0x73, 0x1f, 0x8c, 0xea, 0xca, 0x8b, 0x51, 0x5d, 0xf9, 0x68, 0x54, 0x57, 0xfe, 0x3d, 0xaa, + 0x2b, 0xcf, 0x3e, 0xae, 0xcf, 0x3d, 0xce, 0xf5, 0x37, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0xf7, + 0x85, 0xa4, 0xbc, 0xd2, 0x1b, 0x00, 0x00, } diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto index 9d42018ec12..62a5274e953 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto @@ -61,9 +61,14 @@ message APIGroupList { // APIResource specifies the name of a resource and whether it is namespaced. message APIResource { - // name is the name of the resource. + // name is the plural name of the resource. optional string name = 1; + // singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. + // The singularName is more correct for reporting status on a single item and both singular and plural are allowed + // from the kubectl CLI interface. + optional string singularName = 6; + // namespaced indicates if a resource is namespaced or not. optional bool namespaced = 2; diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go index c6cf1fab888..5e9cf239756 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go @@ -682,8 +682,12 @@ type GroupVersionForDiscovery struct { // APIResource specifies the name of a resource and whether it is namespaced. type APIResource struct { - // name is the name of the resource. + // name is the plural name of the resource. Name string `json:"name" protobuf:"bytes,1,opt,name=name"` + // singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. + // The singularName is more correct for reporting status on a single item and both singular and plural are allowed + // from the kubectl CLI interface. + SingularName string `json:"singularName" protobuf:"bytes,6,opt,name=singularName"` // namespaced indicates if a resource is namespaced or not. Namespaced bool `json:"namespaced" protobuf:"varint,2,opt,name=namespaced"` // kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo') diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go index 950c0028555..e6ebb1c4c47 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_swagger_doc_generated.go @@ -49,12 +49,13 @@ func (APIGroupList) SwaggerDoc() map[string]string { } var map_APIResource = map[string]string{ - "": "APIResource specifies the name of a resource and whether it is namespaced.", - "name": "name is the name of the resource.", - "namespaced": "namespaced indicates if a resource is namespaced or not.", - "kind": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')", - "verbs": "verbs is a list of supported kube verbs (this includes get, list, watch, create, update, patch, delete, deletecollection, and proxy)", - "shortNames": "shortNames is a list of suggested short names of the resource.", + "": "APIResource specifies the name of a resource and whether it is namespaced.", + "name": "name is the plural name of the resource.", + "singularName": "singularName is the singular name of the resource. This allows clients to handle plural and singular opaquely. The singularName is more correct for reporting status on a single item and both singular and plural are allowed from the kubectl CLI interface.", + "namespaced": "namespaced indicates if a resource is namespaced or not.", + "kind": "kind is the kind for the resource (e.g. 'Foo' is the kind for a resource 'foo')", + "verbs": "verbs is a list of supported kube verbs (this includes get, list, watch, create, update, patch, delete, deletecollection, and proxy)", + "shortNames": "shortNames is a list of suggested short names of the resource.", } func (APIResource) SwaggerDoc() map[string]string { diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_test.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_test.go index cbd50009acf..b12134501db 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types_test.go @@ -29,9 +29,9 @@ func TestVerbsUgorjiMarshalJSON(t *testing.T) { input APIResource result string }{ - {APIResource{}, `{"name":"","namespaced":false,"kind":"","verbs":null}`}, - {APIResource{Verbs: Verbs([]string{})}, `{"name":"","namespaced":false,"kind":"","verbs":[]}`}, - {APIResource{Verbs: Verbs([]string{"delete"})}, `{"name":"","namespaced":false,"kind":"","verbs":["delete"]}`}, + {APIResource{}, `{"name":"","singularName":"","namespaced":false,"kind":"","verbs":null}`}, + {APIResource{Verbs: Verbs([]string{})}, `{"name":"","singularName":"","namespaced":false,"kind":"","verbs":[]}`}, + {APIResource{Verbs: Verbs([]string{"delete"})}, `{"name":"","singularName":"","namespaced":false,"kind":"","verbs":["delete"]}`}, } for i, c := range cases {