diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index b14d768b78c..bfe4305d2fe 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -30272,7 +30272,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/v1.LabelSelector" + "$ref": "#/definitions/unversioned.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created when executing a job. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -30315,49 +30315,6 @@ } } }, - "v1.LabelSelector": { - "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", - "properties": { - "matchExpressions": { - "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.", - "type": "array", - "items": { - "$ref": "#/definitions/v1.LabelSelectorRequirement" - } - }, - "matchLabels": { - "description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, - "v1.LabelSelectorRequirement": { - "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", - "required": [ - "key", - "operator" - ], - "properties": { - "key": { - "description": "key is the label key that the selector applies to.", - "type": "string" - }, - "operator": { - "description": "operator represents a key's relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.", - "type": "string" - }, - "values": { - "description": "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.", - "type": "array", - "items": { - "type": "string" - } - } - } - }, "v1.Lifecycle": { "description": "Lifecycle describes actions that the management system should take in response to container lifecycle events. For the PostStart and PreStop lifecycle handlers, management of the container blocks until the action is complete, unless the container process fails, in which case the handler is aborted.", "properties": { @@ -32652,7 +32609,7 @@ "properties": { "selector": { "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", - "$ref": "#/definitions/v1beta1.LabelSelector" + "$ref": "#/definitions/unversioned.LabelSelector" }, "template": { "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", @@ -32782,7 +32739,7 @@ }, "selector": { "description": "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment.", - "$ref": "#/definitions/v1beta1.LabelSelector" + "$ref": "#/definitions/unversioned.LabelSelector" }, "strategy": { "description": "The deployment strategy to use to replace existing pods with new ones.", @@ -33139,7 +33096,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/v1beta1.LabelSelector" + "$ref": "#/definitions/unversioned.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created when executing a job. More info: http://kubernetes.io/docs/user-guide/jobs", @@ -33182,49 +33139,6 @@ } } }, - "v1beta1.LabelSelector": { - "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", - "properties": { - "matchExpressions": { - "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.", - "type": "array", - "items": { - "$ref": "#/definitions/v1beta1.LabelSelectorRequirement" - } - }, - "matchLabels": { - "description": "matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is \"key\", the operator is \"In\", and the values array contains only \"value\". The requirements are ANDed.", - "type": "object", - "additionalProperties": { - "type": "string" - } - } - } - }, - "v1beta1.LabelSelectorRequirement": { - "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", - "required": [ - "key", - "operator" - ], - "properties": { - "key": { - "description": "key is the label key that the selector applies to.", - "type": "string" - }, - "operator": { - "description": "operator represents a key's relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist.", - "type": "string" - }, - "values": { - "description": "values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch.", - "type": "array", - "items": { - "type": "string" - } - } - } - }, "v1beta1.LocalSubjectAccessReview": { "description": "LocalSubjectAccessReview checks whether or not a user or group can perform an action in a given namespace. Having a namespace scoped resource makes it much easier to grant namespace scoped policy that includes permissions checking.", "required": [ @@ -33298,11 +33212,11 @@ "properties": { "namespaceSelector": { "description": "Selects Namespaces using cluster scoped-labels. This matches all pods in all namespaces selected by this label selector. This field follows standard label selector semantics. If omitted, this selector selects no namespaces. If present but empty, this selector selects all namespaces.", - "$ref": "#/definitions/v1beta1.LabelSelector" + "$ref": "#/definitions/unversioned.LabelSelector" }, "podSelector": { "description": "This is a label selector which selects Pods in this namespace. This field follows standard label selector semantics. If not provided, this selector selects no pods. If present but empty, this selector selects all pods in this namespace.", - "$ref": "#/definitions/v1beta1.LabelSelector" + "$ref": "#/definitions/unversioned.LabelSelector" } } }, @@ -33332,7 +33246,7 @@ }, "podSelector": { "description": "Selects the pods to which this NetworkPolicy object applies. The array of ingress rules is applied to any pods selected by this field. Multiple network policies can select the same set of pods. In this case, the ingress rules for each are combined additively. This field is NOT optional and follows standard label selector semantics. An empty podSelector matches all pods in this namespace.", - "$ref": "#/definitions/v1beta1.LabelSelector" + "$ref": "#/definitions/unversioned.LabelSelector" } } }, @@ -33429,7 +33343,7 @@ }, "selector": { "description": "Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors", - "$ref": "#/definitions/v1beta1.LabelSelector" + "$ref": "#/definitions/unversioned.LabelSelector" }, "template": { "description": "Template is the object that describes the pod that will be created if insufficient replicas are detected. More info: http://kubernetes.io/docs/user-guide/replication-controller#pod-template", diff --git a/api/swagger-spec/batch_v1.json b/api/swagger-spec/batch_v1.json index 21c43cf5e7c..b0ac51aee55 100644 --- a/api/swagger-spec/batch_v1.json +++ b/api/swagger-spec/batch_v1.json @@ -1179,7 +1179,7 @@ "description": "Optional duration in seconds relative to the startTime that the job may be active before the system tries to terminate it; value must be positive integer" }, "selector": { - "$ref": "v1.LabelSelector", + "$ref": "unversioned.LabelSelector", "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "manualSelector": { @@ -1192,8 +1192,8 @@ } } }, - "v1.LabelSelector": { - "id": "v1.LabelSelector", + "unversioned.LabelSelector": { + "id": "unversioned.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -1203,14 +1203,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "v1.LabelSelectorRequirement" + "$ref": "unversioned.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "v1.LabelSelectorRequirement": { - "id": "v1.LabelSelectorRequirement", + "unversioned.LabelSelectorRequirement": { + "id": "unversioned.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json index 93b7270cd45..721ab0d26c9 100644 --- a/api/swagger-spec/extensions_v1beta1.json +++ b/api/swagger-spec/extensions_v1beta1.json @@ -7792,7 +7792,7 @@ ], "properties": { "selector": { - "$ref": "v1beta1.LabelSelector", + "$ref": "unversioned.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" }, "template": { @@ -7801,8 +7801,8 @@ } } }, - "v1beta1.LabelSelector": { - "id": "v1beta1.LabelSelector", + "unversioned.LabelSelector": { + "id": "unversioned.LabelSelector", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { "matchLabels": { @@ -7812,14 +7812,14 @@ "matchExpressions": { "type": "array", "items": { - "$ref": "v1beta1.LabelSelectorRequirement" + "$ref": "unversioned.LabelSelectorRequirement" }, "description": "matchExpressions is a list of label selector requirements. The requirements are ANDed." } } }, - "v1beta1.LabelSelectorRequirement": { - "id": "v1beta1.LabelSelectorRequirement", + "unversioned.LabelSelectorRequirement": { + "id": "unversioned.LabelSelectorRequirement", "description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.", "required": [ "key", @@ -9426,7 +9426,7 @@ "description": "Number of desired pods. This is a pointer to distinguish between explicit zero and not specified. Defaults to 1." }, "selector": { - "$ref": "v1beta1.LabelSelector", + "$ref": "unversioned.LabelSelector", "description": "Label selector for pods. Existing ReplicaSets whose pods are selected by this will be the ones affected by this deployment." }, "template": { @@ -10040,7 +10040,7 @@ "description": "Optional duration in seconds relative to the startTime that the job may be active before the system tries to terminate it; value must be positive integer" }, "selector": { - "$ref": "v1beta1.LabelSelector", + "$ref": "unversioned.LabelSelector", "description": "Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "autoSelector": { @@ -10183,7 +10183,7 @@ ], "properties": { "podSelector": { - "$ref": "v1beta1.LabelSelector", + "$ref": "unversioned.LabelSelector", "description": "Selects the pods to which this NetworkPolicy object applies. The array of ingress rules is applied to any pods selected by this field. Multiple network policies can select the same set of pods. In this case, the ingress rules for each are combined additively. This field is NOT optional and follows standard label selector semantics. An empty podSelector matches all pods in this namespace." }, "ingress": { @@ -10236,11 +10236,11 @@ "id": "v1beta1.NetworkPolicyPeer", "properties": { "podSelector": { - "$ref": "v1beta1.LabelSelector", + "$ref": "unversioned.LabelSelector", "description": "This is a label selector which selects Pods in this namespace. This field follows standard label selector semantics. If not provided, this selector selects no pods. If present but empty, this selector selects all pods in this namespace." }, "namespaceSelector": { - "$ref": "v1beta1.LabelSelector", + "$ref": "unversioned.LabelSelector", "description": "Selects Namespaces using cluster scoped-labels. This matches all pods in all namespaces selected by this label selector. This field follows standard label selector semantics. If omitted, this selector selects no namespaces. If present but empty, this selector selects all namespaces." } } @@ -10314,7 +10314,7 @@ "description": "Minimum number of seconds for which a newly created 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)" }, "selector": { - "$ref": "v1beta1.LabelSelector", + "$ref": "unversioned.LabelSelector", "description": "Selector is a label query over pods that should match the replica count. If the selector is empty, it is defaulted to the labels present on the pod template. Label keys and values that must match in order to be controlled by this replica set. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors" }, "template": { diff --git a/docs/api-reference/batch/v1/definitions.html b/docs/api-reference/batch/v1/definitions.html index d4f2e13c369..21f807c199a 100755 --- a/docs/api-reference/batch/v1/definitions.html +++ b/docs/api-reference/batch/v1/definitions.html @@ -652,47 +652,6 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; } - -
A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.
-Name | -Description | -Required | -Schema | -Default | -
---|---|---|---|---|
matchLabels |
-matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. |
-false |
-object |
-- |
matchExpressions |
-matchExpressions is a list of label selector requirements. The requirements are ANDed. |
-false |
-- | - |
A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.
+Name | +Description | +Required | +Schema | +Default | +
---|---|---|---|---|
matchLabels |
+matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. |
+false |
+object |
++ |
matchExpressions |
+matchExpressions is a list of label selector requirements. The requirements are ANDed. |
+false |
++ | + |
A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
-Name | -Description | -Required | -Schema | -Default | -
---|---|---|---|---|
key |
-key is the label key that the selector applies to. |
-true |
-string |
-- |
operator |
-operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist. |
-true |
-string |
-- |
values |
-values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. |
-false |
-string array |
-- |
selector
Selector is a label query over pods that should match the pod count. Normally, the system sets this field for you. More info: http://kubernetes.io/docs/user-guide/labels#label-selectors
false
A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.
+Name | +Description | +Required | +Schema | +Default | +
---|---|---|---|---|
key |
+key is the label key that the selector applies to. |
+true |
+string |
++ |
operator |
+operator represents a key’s relationship to a set of values. Valid operators ard In, NotIn, Exists and DoesNotExist. |
+true |
+string |
++ |
values |
+values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. |
+false |
+string array |
++ |