diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json
index abe04a609f5..b80ebdb4ad1 100644
--- a/api/swagger-spec/extensions_v1beta1.json
+++ b/api/swagger-spec/extensions_v1beta1.json
@@ -1659,7 +1659,7 @@
"description": "API at /apis/extensions/v1beta1",
"operations": [
{
- "type": "v1.Scale",
+ "type": "v1beta1.Scale",
"method": "GET",
"summary": "read scale of the specified Scale",
"nickname": "readNamespacedScaleScale",
@@ -1693,7 +1693,7 @@
{
"code": 200,
"message": "OK",
- "responseModel": "v1.Scale"
+ "responseModel": "v1beta1.Scale"
}
],
"produces": [
@@ -1705,7 +1705,7 @@
]
},
{
- "type": "v1.Scale",
+ "type": "v1beta1.Scale",
"method": "PUT",
"summary": "replace scale of the specified Scale",
"nickname": "replaceNamespacedScaleScale",
@@ -1719,7 +1719,7 @@
"allowMultiple": false
},
{
- "type": "v1.Scale",
+ "type": "v1beta1.Scale",
"paramType": "body",
"name": "body",
"description": "",
@@ -1747,7 +1747,7 @@
{
"code": 200,
"message": "OK",
- "responseModel": "v1.Scale"
+ "responseModel": "v1beta1.Scale"
}
],
"produces": [
@@ -1759,7 +1759,7 @@
]
},
{
- "type": "v1.Scale",
+ "type": "v1beta1.Scale",
"method": "PATCH",
"summary": "partially update scale of the specified Scale",
"nickname": "patchNamespacedScaleScale",
@@ -1801,7 +1801,7 @@
{
"code": 200,
"message": "OK",
- "responseModel": "v1.Scale"
+ "responseModel": "v1beta1.Scale"
}
],
"produces": [
@@ -5121,7 +5121,7 @@
"description": "API at /apis/extensions/v1beta1",
"operations": [
{
- "type": "v1.Scale",
+ "type": "v1beta1.Scale",
"method": "GET",
"summary": "read scale of the specified Scale",
"nickname": "readNamespacedScaleScale",
@@ -5155,7 +5155,7 @@
{
"code": 200,
"message": "OK",
- "responseModel": "v1.Scale"
+ "responseModel": "v1beta1.Scale"
}
],
"produces": [
@@ -5167,7 +5167,7 @@
]
},
{
- "type": "v1.Scale",
+ "type": "v1beta1.Scale",
"method": "PUT",
"summary": "replace scale of the specified Scale",
"nickname": "replaceNamespacedScaleScale",
@@ -5181,7 +5181,7 @@
"allowMultiple": false
},
{
- "type": "v1.Scale",
+ "type": "v1beta1.Scale",
"paramType": "body",
"name": "body",
"description": "",
@@ -5209,7 +5209,7 @@
{
"code": 200,
"message": "OK",
- "responseModel": "v1.Scale"
+ "responseModel": "v1beta1.Scale"
}
],
"produces": [
@@ -5221,7 +5221,7 @@
]
},
{
- "type": "v1.Scale",
+ "type": "v1beta1.Scale",
"method": "PATCH",
"summary": "partially update scale of the specified Scale",
"nickname": "patchNamespacedScaleScale",
@@ -5263,7 +5263,7 @@
{
"code": 200,
"message": "OK",
- "responseModel": "v1.Scale"
+ "responseModel": "v1beta1.Scale"
}
],
"produces": [
@@ -7234,9 +7234,9 @@
}
}
},
- "v1.Scale": {
- "id": "v1.Scale",
- "description": "Scale represents a scaling request for a resource.",
+ "v1beta1.Scale": {
+ "id": "v1beta1.Scale",
+ "description": "represents a scaling request for a resource.",
"properties": {
"kind": {
"type": "string",
@@ -7251,18 +7251,18 @@
"description": "Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata."
},
"spec": {
- "$ref": "v1.ScaleSpec",
+ "$ref": "v1beta1.ScaleSpec",
"description": "defines the behavior of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status."
},
"status": {
- "$ref": "v1.ScaleStatus",
+ "$ref": "v1beta1.ScaleStatus",
"description": "current status of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. Read-only."
}
}
},
- "v1.ScaleSpec": {
- "id": "v1.ScaleSpec",
- "description": "ScaleSpec describes the attributes of a scale subresource.",
+ "v1beta1.ScaleSpec": {
+ "id": "v1beta1.ScaleSpec",
+ "description": "describes the attributes of a scale subresource",
"properties": {
"replicas": {
"type": "integer",
@@ -7271,9 +7271,9 @@
}
}
},
- "v1.ScaleStatus": {
- "id": "v1.ScaleStatus",
- "description": "ScaleStatus represents the current status of a scale subresource.",
+ "v1beta1.ScaleStatus": {
+ "id": "v1beta1.ScaleStatus",
+ "description": "represents the current status of a scale subresource.",
"required": [
"replicas"
],
@@ -7284,8 +7284,12 @@
"description": "actual number of observed instances of the scaled object."
},
"selector": {
+ "type": "any",
+ "description": "label query over pods that should match the replicas count. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors"
+ },
+ "targetSelector": {
"type": "string",
- "description": "label query over pods that should match the replicas count. This is same as the label selector but in the string format to avoid introspection by clients. The string will be in the same format as the query-param syntax. More info about label selectors: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors"
+ "description": "label selector for pods that should match the replicas count. This is a serializated version of both map-based and more expressive set-based selectors. This is done to avoid introspection in the clients. The string will be in the same format as the query-param syntax. If the target type only supports map-based selectors, both this field and map-based selector field are populated. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors"
}
}
},
@@ -7887,61 +7891,6 @@
"description": "ObservedGeneration reflects the generation of the most recently observed ReplicaSet."
}
}
- },
- "v1beta1.Scale": {
- "id": "v1beta1.Scale",
- "description": "represents a scaling request for a resource.",
- "properties": {
- "kind": {
- "type": "string",
- "description": "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds"
- },
- "apiVersion": {
- "type": "string",
- "description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#resources"
- },
- "metadata": {
- "$ref": "v1.ObjectMeta",
- "description": "Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata."
- },
- "spec": {
- "$ref": "v1beta1.ScaleSpec",
- "description": "defines the behavior of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status."
- },
- "status": {
- "$ref": "v1beta1.ScaleStatus",
- "description": "current status of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. Read-only."
- }
- }
- },
- "v1beta1.ScaleSpec": {
- "id": "v1beta1.ScaleSpec",
- "description": "describes the attributes of a scale subresource",
- "properties": {
- "replicas": {
- "type": "integer",
- "format": "int32",
- "description": "desired number of instances for the scaled object."
- }
- }
- },
- "v1beta1.ScaleStatus": {
- "id": "v1beta1.ScaleStatus",
- "description": "represents the current status of a scale subresource.",
- "required": [
- "replicas"
- ],
- "properties": {
- "replicas": {
- "type": "integer",
- "format": "int32",
- "description": "actual number of observed instances of the scaled object."
- },
- "selector": {
- "type": "any",
- "description": "label query over pods that should match the replicas count. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors"
- }
- }
}
}
}
\ No newline at end of file
diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html
index 7325fd4a005..af2eccc0b10 100755
--- a/docs/api-reference/extensions/v1beta1/definitions.html
+++ b/docs/api-reference/extensions/v1beta1/definitions.html
@@ -1332,47 +1332,6 @@ Examples:
-
-
-
v1.ScaleStatus
-
-
ScaleStatus represents the current status of a scale subresource.
-
-
-
-
-
-
-
-
-
-
-
-| Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-replicas |
-actual number of observed instances of the scaled object. |
-true |
-integer (int32) |
- |
-
-
-selector |
-label query over pods that should match the replicas count. This is same as the label selector but in the string format to avoid introspection by clients. The string will be in the same format as the query-param syntax. More info about label selectors: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors |
-false |
-string |
- |
-
-
-
-
v1beta1.JobStatus
@@ -2457,68 +2416,6 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
-
-
-
v1.Scale
-
-
Scale represents a scaling request for a resource.
-
-
-
v1.LoadBalancerIngress
@@ -3737,6 +3634,13 @@ Populated by the system when a graceful deletion is requested. Read-only. More i
any |
|
+
+targetSelector |
+label selector for pods that should match the replicas count. This is a serializated version of both map-based and more expressive set-based selectors. This is done to avoid introspection in the clients. The string will be in the same format as the query-param syntax. If the target type only supports map-based selectors, both this field and map-based selector field are populated. More info: http://releases.k8s.io/HEAD/docs/user-guide/labels.md#label-selectors |
+false |
+string |
+ |
+
@@ -4686,40 +4590,6 @@ Both these may change in the future. Incoming requests are matched against the h
-
-
-
v1.ScaleSpec
-
-
ScaleSpec describes the attributes of a scale subresource.
-
-
-
-
-
-
-
-
-
-
-
-| Name |
-Description |
-Required |
-Schema |
-Default |
-
-
-
-
-replicas |
-desired number of instances for the scaled object. |
-false |
-integer (int32) |
- |
-
-
-
-
v1beta1.LabelSelector
@@ -5728,7 +5598,7 @@ Both these may change in the future. Incoming requests are matched against the h
diff --git a/docs/api-reference/extensions/v1beta1/operations.html b/docs/api-reference/extensions/v1beta1/operations.html
index b76e7446bde..d820a374bef 100755
--- a/docs/api-reference/extensions/v1beta1/operations.html
+++ b/docs/api-reference/extensions/v1beta1/operations.html
@@ -3304,7 +3304,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }