github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50708 from DirectXMan12/versions/autoscaling-v2beta1

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 51956, 50708)

Move autoscaling/v2 from alpha1 to beta1

This graduates autoscaling/v2alpha1 to autoscaling/v2beta1.  The move is more-or-less just a straightforward rename.

Part of kubernetes/features#117

```release-note
v2 of the autoscaling API group, including improvements to the HorizontalPodAutoscaler, has moved from alpha1 to beta1.
```
This commit is contained in:
Kubernetes Submit Queue 2017-09-06 15:46:24 -07:00 committed by GitHub
commit 3168bd4b12
80 changed files with 1489 additions and 1566 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

250
api/openapi-spec/swagger.json
View File

@ -32692,7 +32692,7 @@
}
]
},
"/apis/autoscaling/v2alpha1/": {
"/apis/autoscaling/v2beta1/": {
"get": {
"description": "get available resources",
"consumes": [
@ -32709,9 +32709,9 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "getAutoscalingV2alpha1APIResources",
"operationId": "getAutoscalingV2beta1APIResources",
"responses": {
"200": {
"description": "OK",
@ -32725,7 +32725,7 @@
}
}
},
"/apis/autoscaling/v2alpha1/horizontalpodautoscalers": {
"/apis/autoscaling/v2beta1/horizontalpodautoscalers": {
"get": {
"description": "list or watch objects of kind HorizontalPodAutoscaler",
"consumes": [
@ -32742,14 +32742,14 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "listAutoscalingV2alpha1HorizontalPodAutoscalerForAllNamespaces",
"operationId": "listAutoscalingV2beta1HorizontalPodAutoscalerForAllNamespaces",
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerList"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscalerList"
}
},
"401": {
@ -32760,7 +32760,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"parameters": [
@ -32829,7 +32829,7 @@
}
]
},
"/apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers": {
"/apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers": {
"get": {
"description": "list or watch objects of kind HorizontalPodAutoscaler",
"consumes": [
@ -32846,9 +32846,9 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "listAutoscalingV2alpha1NamespacedHorizontalPodAutoscaler",
"operationId": "listAutoscalingV2beta1NamespacedHorizontalPodAutoscaler",
"parameters": [
{
"uniqueItems": true,
@ -32911,7 +32911,7 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerList"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscalerList"
}
},
"401": {
@ -32922,7 +32922,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"post": {
@ -32939,16 +32939,16 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "createAutoscalingV2alpha1NamespacedHorizontalPodAutoscaler",
"operationId": "createAutoscalingV2beta1NamespacedHorizontalPodAutoscaler",
"parameters": [
{
"name": "body",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscaler"
}
}
],
@ -32956,7 +32956,7 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscaler"
}
},
"401": {
@ -32967,7 +32967,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"delete": {
@ -32984,9 +32984,9 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "deleteAutoscalingV2alpha1CollectionNamespacedHorizontalPodAutoscaler",
"operationId": "deleteAutoscalingV2beta1CollectionNamespacedHorizontalPodAutoscaler",
"parameters": [
{
"uniqueItems": true,
@ -33060,7 +33060,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"parameters": [
@ -33081,7 +33081,7 @@
}
]
},
"/apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers/{name}": {
"/apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}": {
"get": {
"description": "read the specified HorizontalPodAutoscaler",
"consumes": [
@ -33096,9 +33096,9 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "readAutoscalingV2alpha1NamespacedHorizontalPodAutoscaler",
"operationId": "readAutoscalingV2beta1NamespacedHorizontalPodAutoscaler",
"parameters": [
{
"uniqueItems": true,
@ -33119,7 +33119,7 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscaler"
}
},
"401": {
@ -33130,7 +33130,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"put": {
@ -33147,16 +33147,16 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "replaceAutoscalingV2alpha1NamespacedHorizontalPodAutoscaler",
"operationId": "replaceAutoscalingV2beta1NamespacedHorizontalPodAutoscaler",
"parameters": [
{
"name": "body",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscaler"
}
}
],
@ -33164,7 +33164,7 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscaler"
}
},
"401": {
@ -33175,7 +33175,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"delete": {
@ -33192,9 +33192,9 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "deleteAutoscalingV2alpha1NamespacedHorizontalPodAutoscaler",
"operationId": "deleteAutoscalingV2beta1NamespacedHorizontalPodAutoscaler",
"parameters": [
{
"name": "body",
@ -33241,7 +33241,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"patch": {
@ -33260,9 +33260,9 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "patchAutoscalingV2alpha1NamespacedHorizontalPodAutoscaler",
"operationId": "patchAutoscalingV2beta1NamespacedHorizontalPodAutoscaler",
"parameters": [
{
"name": "body",
@ -33277,7 +33277,7 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscaler"
}
},
"401": {
@ -33288,7 +33288,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"parameters": [
@ -33317,7 +33317,7 @@
}
]
},
"/apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status": {
"/apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status": {
"get": {
"description": "read status of the specified HorizontalPodAutoscaler",
"consumes": [
@ -33332,14 +33332,14 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "readAutoscalingV2alpha1NamespacedHorizontalPodAutoscalerStatus",
"operationId": "readAutoscalingV2beta1NamespacedHorizontalPodAutoscalerStatus",
"responses": {
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscaler"
}
},
"401": {
@ -33350,7 +33350,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"put": {
@ -33367,16 +33367,16 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "replaceAutoscalingV2alpha1NamespacedHorizontalPodAutoscalerStatus",
"operationId": "replaceAutoscalingV2beta1NamespacedHorizontalPodAutoscalerStatus",
"parameters": [
{
"name": "body",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscaler"
}
}
],
@ -33384,7 +33384,7 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscaler"
}
},
"401": {
@ -33395,7 +33395,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"patch": {
@ -33414,9 +33414,9 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "patchAutoscalingV2alpha1NamespacedHorizontalPodAutoscalerStatus",
"operationId": "patchAutoscalingV2beta1NamespacedHorizontalPodAutoscalerStatus",
"parameters": [
{
"name": "body",
@ -33431,7 +33431,7 @@
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscaler"
}
},
"401": {
@ -33442,7 +33442,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"parameters": [
@ -33471,7 +33471,7 @@
}
]
},
"/apis/autoscaling/v2alpha1/watch/horizontalpodautoscalers": {
"/apis/autoscaling/v2beta1/watch/horizontalpodautoscalers": {
"get": {
"description": "watch individual changes to a list of HorizontalPodAutoscaler",
"consumes": [
@ -33488,9 +33488,9 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "watchAutoscalingV2alpha1HorizontalPodAutoscalerListForAllNamespaces",
"operationId": "watchAutoscalingV2beta1HorizontalPodAutoscalerListForAllNamespaces",
"responses": {
"200": {
"description": "OK",
@ -33506,7 +33506,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"parameters": [
@ -33575,7 +33575,7 @@
}
]
},
"/apis/autoscaling/v2alpha1/watch/namespaces/{namespace}/horizontalpodautoscalers": {
"/apis/autoscaling/v2beta1/watch/namespaces/{namespace}/horizontalpodautoscalers": {
"get": {
"description": "watch individual changes to a list of HorizontalPodAutoscaler",
"consumes": [
@ -33592,9 +33592,9 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "watchAutoscalingV2alpha1NamespacedHorizontalPodAutoscalerList",
"operationId": "watchAutoscalingV2beta1NamespacedHorizontalPodAutoscalerList",
"responses": {
"200": {
"description": "OK",
@ -33610,7 +33610,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"parameters": [
@ -33687,7 +33687,7 @@
}
]
},
"/apis/autoscaling/v2alpha1/watch/namespaces/{namespace}/horizontalpodautoscalers/{name}": {
"/apis/autoscaling/v2beta1/watch/namespaces/{namespace}/horizontalpodautoscalers/{name}": {
"get": {
"description": "watch changes to an object of kind HorizontalPodAutoscaler",
"consumes": [
@ -33704,9 +33704,9 @@
"https"
],
"tags": [
"autoscaling_v2alpha1"
"autoscaling_v2beta1"
],
"operationId": "watchAutoscalingV2alpha1NamespacedHorizontalPodAutoscaler",
"operationId": "watchAutoscalingV2beta1NamespacedHorizontalPodAutoscaler",
"responses": {
"200": {
"description": "OK",
@ -33722,7 +33722,7 @@
"x-kubernetes-group-version-kind": {
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
},
"parameters": [
@ -62500,7 +62500,7 @@
}
}
},
"io.k8s.api.autoscaling.v2alpha1.CrossVersionObjectReference": {
"io.k8s.api.autoscaling.v2beta1.CrossVersionObjectReference": {
"description": "CrossVersionObjectReference contains enough information to let you identify the referred resource.",
"required": [
"kind",
@ -62521,7 +62521,7 @@
}
}
},
"io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler": {
"io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscaler": {
"description": "HorizontalPodAutoscaler is the configuration for a horizontal pod autoscaler, which automatically manages the replica count of any resource implementing the scale subresource based on the metrics specified.",
"properties": {
"apiVersion": {
@ -62538,22 +62538,22 @@
},
"spec": {
"description": "spec is the specification for the behaviour of the autoscaler. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerSpec"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscalerSpec"
},
"status": {
"description": "status is the current information about the autoscaler.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerStatus"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscalerStatus"
}
},
"x-kubernetes-group-version-kind": [
{
"group": "autoscaling",
"kind": "HorizontalPodAutoscaler",
"version": "v2alpha1"
"version": "v2beta1"
}
]
},
"io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerCondition": {
"io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscalerCondition": {
"description": "HorizontalPodAutoscalerCondition describes the state of a HorizontalPodAutoscaler at a certain point.",
"required": [
"type",
@ -62582,7 +62582,7 @@
}
}
},
"io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerList": {
"io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscalerList": {
"description": "HorizontalPodAutoscaler is a list of horizontal pod autoscaler objects.",
"required": [
"items"
@ -62596,7 +62596,7 @@
"description": "items is the list of horizontal pod autoscaler objects.",
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscaler"
}
},
"kind": {
@ -62612,11 +62612,11 @@
{
"group": "autoscaling",
"kind": "HorizontalPodAutoscalerList",
"version": "v2alpha1"
"version": "v2beta1"
}
]
},
"io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerSpec": {
"io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscalerSpec": {
"description": "HorizontalPodAutoscalerSpec describes the desired functionality of the HorizontalPodAutoscaler.",
"required": [
"scaleTargetRef",
@ -62632,7 +62632,7 @@
"description": "metrics contains the specifications for which to use to calculate the desired replica count (the maximum replica count across all metrics will be used). The desired replica count is calculated multiplying the ratio between the target value and the current value by the current number of pods. Ergo, metrics used must decrease as the pod count is increased, and vice-versa. See the individual metric source types for more information about how each type of metric must respond.",
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.MetricSpec"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.MetricSpec"
}
},
"minReplicas": {
@ -62642,11 +62642,11 @@
},
"scaleTargetRef": {
"description": "scaleTargetRef points to the target resource to scale, and is used to the pods for which metrics should be collected, as well as to actually change the replica count.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.CrossVersionObjectReference"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.CrossVersionObjectReference"
}
}
},
"io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerStatus": {
"io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscalerStatus": {
"description": "HorizontalPodAutoscalerStatus describes the current status of a horizontal pod autoscaler.",
"required": [
"currentReplicas",
@ -62659,14 +62659,14 @@
"description": "conditions is the set of conditions required for this autoscaler to scale its target, and indicates whether or not those conditions are met.",
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerCondition"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.HorizontalPodAutoscalerCondition"
}
},
"currentMetrics": {
"description": "currentMetrics is the last read state of the metrics used by this autoscaler.",
"type": "array",
"items": {
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.MetricStatus"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.MetricStatus"
}
},
"currentReplicas": {
@ -62690,7 +62690,7 @@
}
}
},
"io.k8s.api.autoscaling.v2alpha1.MetricSpec": {
"io.k8s.api.autoscaling.v2beta1.MetricSpec": {
"description": "MetricSpec specifies how to scale based on a single metric (only `type` and one other matching field should be set at once).",
"required": [
"type"
@ -62698,15 +62698,15 @@
"properties": {
"object": {
"description": "object refers to a metric describing a single kubernetes object (for example, hits-per-second on an Ingress object).",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.ObjectMetricSource"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.ObjectMetricSource"
},
"pods": {
"description": "pods refers to a metric describing each pod in the current scale target (for example, transactions-processed-per-second). The values will be averaged together before being compared to the target value.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.PodsMetricSource"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.PodsMetricSource"
},
"resource": {
"description": "resource refers to a resource metric (such as those specified in requests and limits) known to Kubernetes describing each pod in the current scale target (e.g. CPU or memory). Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics using the \"pods\" source.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.ResourceMetricSource"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.ResourceMetricSource"
},
"type": {
"description": "type is the type of metric source. It should match one of the fields below.",
@ -62714,7 +62714,7 @@
}
}
},
"io.k8s.api.autoscaling.v2alpha1.MetricStatus": {
"io.k8s.api.autoscaling.v2beta1.MetricStatus": {
"description": "MetricStatus describes the last-read state of a single metric.",
"required": [
"type"
@ -62722,15 +62722,15 @@
"properties": {
"object": {
"description": "object refers to a metric describing a single kubernetes object (for example, hits-per-second on an Ingress object).",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.ObjectMetricStatus"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.ObjectMetricStatus"
},
"pods": {
"description": "pods refers to a metric describing each pod in the current scale target (for example, transactions-processed-per-second). The values will be averaged together before being compared to the target value.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.PodsMetricStatus"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.PodsMetricStatus"
},
"resource": {
"description": "resource refers to a resource metric (such as those specified in requests and limits) known to Kubernetes describing each pod in the current scale target (e.g. CPU or memory). Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics using the \"pods\" source.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.ResourceMetricStatus"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.ResourceMetricStatus"
},
"type": {
"description": "type is the type of metric source. It will match one of the fields below.",
@ -62738,7 +62738,7 @@
}
}
},
"io.k8s.api.autoscaling.v2alpha1.ObjectMetricSource": {
"io.k8s.api.autoscaling.v2beta1.ObjectMetricSource": {
"description": "ObjectMetricSource indicates how to scale on a metric describing a kubernetes object (for example, hits-per-second on an Ingress object).",
"required": [
"target",
@ -62752,7 +62752,7 @@
},
"target": {
"description": "target is the described Kubernetes object.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.CrossVersionObjectReference"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.CrossVersionObjectReference"
},
"targetValue": {
"description": "targetValue is the target value of the metric (as a quantity).",
@ -62760,7 +62760,7 @@
}
}
},
"io.k8s.api.autoscaling.v2alpha1.ObjectMetricStatus": {
"io.k8s.api.autoscaling.v2beta1.ObjectMetricStatus": {
"description": "ObjectMetricStatus indicates the current value of a metric describing a kubernetes object (for example, hits-per-second on an Ingress object).",
"required": [
"target",
@ -62778,11 +62778,11 @@
},
"target": {
"description": "target is the described Kubernetes object.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.CrossVersionObjectReference"
"$ref": "#/definitions/io.k8s.api.autoscaling.v2beta1.CrossVersionObjectReference"
}
}
},
"io.k8s.api.autoscaling.v2alpha1.PodsMetricSource": {
"io.k8s.api.autoscaling.v2beta1.PodsMetricSource": {
"description": "PodsMetricSource indicates how to scale on a metric describing each pod in the current scale target (for example, transactions-processed-per-second). The values will be averaged together before being compared to the target value.",
"required": [
"metricName",
@ -62799,7 +62799,7 @@
}
}
},
"io.k8s.api.autoscaling.v2alpha1.PodsMetricStatus": {
"io.k8s.api.autoscaling.v2beta1.PodsMetricStatus": {
"description": "PodsMetricStatus indicates the current value of a metric describing each pod in the current scale target (for example, transactions-processed-per-second).",
"required": [
"metricName",
@ -62816,7 +62816,7 @@
}
}
},
"io.k8s.api.autoscaling.v2alpha1.ResourceMetricSource": {
"io.k8s.api.autoscaling.v2beta1.ResourceMetricSource": {
"description": "ResourceMetricSource indicates how to scale on a resource metric known to Kubernetes, as specified in requests and limits, describing each pod in the current scale target (e.g. CPU or memory). The values will be averaged together before being compared to the target. Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics using the \"pods\" source. Only one \"target\" type should be set.",
"required": [
"name"
@ -62837,7 +62837,7 @@
}
}
},
"io.k8s.api.autoscaling.v2alpha1.ResourceMetricStatus": {
"io.k8s.api.autoscaling.v2beta1.ResourceMetricStatus": {
"description": "ResourceMetricStatus indicates the current value of a resource metric known to Kubernetes, as specified in requests and limits, describing each pod in the current scale target (e.g. CPU or memory). Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics using the \"pods\" source.",
"required": [
"name",
@ -71669,7 +71669,7 @@
{
"group": "autoscaling",
"kind": "DeleteOptions",
"version": "v2alpha1"
"version": "v2beta1"
},
{
"group": "batch",
@ -72183,7 +72183,7 @@
{
"group": "autoscaling",
"kind": "WatchEvent",
"version": "v2alpha1"
"version": "v2beta1"
},
{
"group": "batch",
@ -73317,62 +73317,6 @@
"description": "Deprecated. Please use io.k8s.api.autoscaling.v1.ScaleStatus instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v1.ScaleStatus"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.CrossVersionObjectReference": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.CrossVersionObjectReference instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.CrossVersionObjectReference"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.HorizontalPodAutoscaler": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscaler"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.HorizontalPodAutoscalerCondition": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerCondition instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerCondition"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.HorizontalPodAutoscalerList": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerList instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerList"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.HorizontalPodAutoscalerSpec": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerSpec instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerSpec"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.HorizontalPodAutoscalerStatus": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerStatus instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.HorizontalPodAutoscalerStatus"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.MetricSpec": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.MetricSpec instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.MetricSpec"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.MetricStatus": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.MetricStatus instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.MetricStatus"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.ObjectMetricSource": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.ObjectMetricSource instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.ObjectMetricSource"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.ObjectMetricStatus": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.ObjectMetricStatus instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.ObjectMetricStatus"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.PodsMetricSource": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.PodsMetricSource instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.PodsMetricSource"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.PodsMetricStatus": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.PodsMetricStatus instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.PodsMetricStatus"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.ResourceMetricSource": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.ResourceMetricSource instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.ResourceMetricSource"
},
"io.k8s.kubernetes.pkg.apis.autoscaling.v2alpha1.ResourceMetricStatus": {
"description": "Deprecated. Please use io.k8s.api.autoscaling.v2alpha1.ResourceMetricStatus instead.",
"$ref": "#/definitions/io.k8s.api.autoscaling.v2alpha1.ResourceMetricStatus"
},
"io.k8s.kubernetes.pkg.apis.batch.v1.Job": {
"description": "Deprecated. Please use io.k8s.api.batch.v1.Job instead.",
"$ref": "#/definitions/io.k8s.api.batch.v1.Job"

164
api/swagger-spec/autoscaling_v2alpha1.json → api/swagger-spec/autoscaling_v2beta1.json
View File

@ -1,19 +1,19 @@
{
"swaggerVersion": "1.2",
"apiVersion": "autoscaling/v2alpha1",
"apiVersion": "autoscaling/v2beta1",
"basePath": "https://10.10.10.10:6443",
"resourcePath": "/apis/autoscaling/v2alpha1",
"resourcePath": "/apis/autoscaling/v2beta1",
"info": {
"title": "",
"description": ""
},
"apis": [
{
"path": "/apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers",
"description": "API at /apis/autoscaling/v2alpha1",
"path": "/apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers",
"description": "API at /apis/autoscaling/v2beta1",
"operations": [
{
"type": "v2alpha1.HorizontalPodAutoscalerList",
"type": "v2beta1.HorizontalPodAutoscalerList",
"method": "GET",
"summary": "list or watch objects of kind HorizontalPodAutoscaler",
"nickname": "listNamespacedHorizontalPodAutoscaler",
@ -103,7 +103,7 @@
{
"code": 200,
"message": "OK",
"responseModel": "v2alpha1.HorizontalPodAutoscalerList"
"responseModel": "v2beta1.HorizontalPodAutoscalerList"
}
],
"produces": [
@ -118,7 +118,7 @@
]
},
{
"type": "v2alpha1.HorizontalPodAutoscaler",
"type": "v2beta1.HorizontalPodAutoscaler",
"method": "POST",
"summary": "create a HorizontalPodAutoscaler",
"nickname": "createNamespacedHorizontalPodAutoscaler",
@ -132,7 +132,7 @@
"allowMultiple": false
},
{
"type": "v2alpha1.HorizontalPodAutoscaler",
"type": "v2beta1.HorizontalPodAutoscaler",
"paramType": "body",
"name": "body",
"description": "",
@ -152,7 +152,7 @@
{
"code": 200,
"message": "OK",
"responseModel": "v2alpha1.HorizontalPodAutoscaler"
"responseModel": "v2beta1.HorizontalPodAutoscaler"
}
],
"produces": [
@ -270,8 +270,8 @@
]
},
{
"path": "/apis/autoscaling/v2alpha1/watch/namespaces/{namespace}/horizontalpodautoscalers",
"description": "API at /apis/autoscaling/v2alpha1",
"path": "/apis/autoscaling/v2beta1/watch/namespaces/{namespace}/horizontalpodautoscalers",
"description": "API at /apis/autoscaling/v2beta1",
"operations": [
{
"type": "v1.WatchEvent",
@ -381,11 +381,11 @@
]
},
{
"path": "/apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers/{name}",
"description": "API at /apis/autoscaling/v2alpha1",
"path": "/apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}",
"description": "API at /apis/autoscaling/v2beta1",
"operations": [
{
"type": "v2alpha1.HorizontalPodAutoscaler",
"type": "v2beta1.HorizontalPodAutoscaler",
"method": "GET",
"summary": "read the specified HorizontalPodAutoscaler",
"nickname": "readNamespacedHorizontalPodAutoscaler",
@ -435,7 +435,7 @@
{
"code": 200,
"message": "OK",
"responseModel": "v2alpha1.HorizontalPodAutoscaler"
"responseModel": "v2beta1.HorizontalPodAutoscaler"
}
],
"produces": [
@ -448,7 +448,7 @@
]
},
{
"type": "v2alpha1.HorizontalPodAutoscaler",
"type": "v2beta1.HorizontalPodAutoscaler",
"method": "PUT",
"summary": "replace the specified HorizontalPodAutoscaler",
"nickname": "replaceNamespacedHorizontalPodAutoscaler",
@ -462,7 +462,7 @@
"allowMultiple": false
},
{
"type": "v2alpha1.HorizontalPodAutoscaler",
"type": "v2beta1.HorizontalPodAutoscaler",
"paramType": "body",
"name": "body",
"description": "",
@ -490,7 +490,7 @@
{
"code": 200,
"message": "OK",
"responseModel": "v2alpha1.HorizontalPodAutoscaler"
"responseModel": "v2beta1.HorizontalPodAutoscaler"
}
],
"produces": [
@ -503,7 +503,7 @@
]
},
{
"type": "v2alpha1.HorizontalPodAutoscaler",
"type": "v2beta1.HorizontalPodAutoscaler",
"method": "PATCH",
"summary": "partially update the specified HorizontalPodAutoscaler",
"nickname": "patchNamespacedHorizontalPodAutoscaler",
@ -545,7 +545,7 @@
{
"code": 200,
"message": "OK",
"responseModel": "v2alpha1.HorizontalPodAutoscaler"
"responseModel": "v2beta1.HorizontalPodAutoscaler"
}
],
"produces": [
@ -641,8 +641,8 @@
]
},
{
"path": "/apis/autoscaling/v2alpha1/watch/namespaces/{namespace}/horizontalpodautoscalers/{name}",
"description": "API at /apis/autoscaling/v2alpha1",
"path": "/apis/autoscaling/v2beta1/watch/namespaces/{namespace}/horizontalpodautoscalers/{name}",
"description": "API at /apis/autoscaling/v2beta1",
"operations": [
{
"type": "v1.WatchEvent",
@ -760,11 +760,11 @@
]
},
{
"path": "/apis/autoscaling/v2alpha1/horizontalpodautoscalers",
"description": "API at /apis/autoscaling/v2alpha1",
"path": "/apis/autoscaling/v2beta1/horizontalpodautoscalers",
"description": "API at /apis/autoscaling/v2beta1",
"operations": [
{
"type": "v2alpha1.HorizontalPodAutoscalerList",
"type": "v2beta1.HorizontalPodAutoscalerList",
"method": "GET",
"summary": "list or watch objects of kind HorizontalPodAutoscaler",
"nickname": "listHorizontalPodAutoscalerForAllNamespaces",
@ -846,7 +846,7 @@
{
"code": 200,
"message": "OK",
"responseModel": "v2alpha1.HorizontalPodAutoscalerList"
"responseModel": "v2beta1.HorizontalPodAutoscalerList"
}
],
"produces": [
@ -863,8 +863,8 @@
]
},
{
"path": "/apis/autoscaling/v2alpha1/watch/horizontalpodautoscalers",
"description": "API at /apis/autoscaling/v2alpha1",
"path": "/apis/autoscaling/v2beta1/watch/horizontalpodautoscalers",
"description": "API at /apis/autoscaling/v2beta1",
"operations": [
{
"type": "v1.WatchEvent",
@ -966,11 +966,11 @@
]
},
{
"path": "/apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status",
"description": "API at /apis/autoscaling/v2alpha1",
"path": "/apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status",
"description": "API at /apis/autoscaling/v2beta1",
"operations": [
{
"type": "v2alpha1.HorizontalPodAutoscaler",
"type": "v2beta1.HorizontalPodAutoscaler",
"method": "GET",
"summary": "read status of the specified HorizontalPodAutoscaler",
"nickname": "readNamespacedHorizontalPodAutoscalerStatus",
@ -1004,7 +1004,7 @@
{
"code": 200,
"message": "OK",
"responseModel": "v2alpha1.HorizontalPodAutoscaler"
"responseModel": "v2beta1.HorizontalPodAutoscaler"
}
],
"produces": [
@ -1017,7 +1017,7 @@
]
},
{
"type": "v2alpha1.HorizontalPodAutoscaler",
"type": "v2beta1.HorizontalPodAutoscaler",
"method": "PUT",
"summary": "replace status of the specified HorizontalPodAutoscaler",
"nickname": "replaceNamespacedHorizontalPodAutoscalerStatus",
@ -1031,7 +1031,7 @@
"allowMultiple": false
},
{
"type": "v2alpha1.HorizontalPodAutoscaler",
"type": "v2beta1.HorizontalPodAutoscaler",
"paramType": "body",
"name": "body",
"description": "",
@ -1059,7 +1059,7 @@
{
"code": 200,
"message": "OK",
"responseModel": "v2alpha1.HorizontalPodAutoscaler"
"responseModel": "v2beta1.HorizontalPodAutoscaler"
}
],
"produces": [
@ -1072,7 +1072,7 @@
]
},
{
"type": "v2alpha1.HorizontalPodAutoscaler",
"type": "v2beta1.HorizontalPodAutoscaler",
"method": "PATCH",
"summary": "partially update status of the specified HorizontalPodAutoscaler",
"nickname": "patchNamespacedHorizontalPodAutoscalerStatus",
@ -1114,7 +1114,7 @@
{
"code": 200,
"message": "OK",
"responseModel": "v2alpha1.HorizontalPodAutoscaler"
"responseModel": "v2beta1.HorizontalPodAutoscaler"
}
],
"produces": [
@ -1131,8 +1131,8 @@
]
},
{
"path": "/apis/autoscaling/v2alpha1",
"description": "API at /apis/autoscaling/v2alpha1",
"path": "/apis/autoscaling/v2beta1",
"description": "API at /apis/autoscaling/v2beta1",
"operations": [
{
"type": "v1.APIResourceList",
@ -1155,8 +1155,8 @@
}
],
"models": {
"v2alpha1.HorizontalPodAutoscalerList": {
"id": "v2alpha1.HorizontalPodAutoscalerList",
"v2beta1.HorizontalPodAutoscalerList": {
"id": "v2beta1.HorizontalPodAutoscalerList",
"description": "HorizontalPodAutoscaler is a list of horizontal pod autoscaler objects.",
"required": [
"items"
@ -1177,7 +1177,7 @@
"items": {
"type": "array",
"items": {
"$ref": "v2alpha1.HorizontalPodAutoscaler"
"$ref": "v2beta1.HorizontalPodAutoscaler"
},
"description": "items is the list of horizontal pod autoscaler objects."
}
@ -1201,8 +1201,8 @@
}
}
},
"v2alpha1.HorizontalPodAutoscaler": {
"id": "v2alpha1.HorizontalPodAutoscaler",
"v2beta1.HorizontalPodAutoscaler": {
"id": "v2beta1.HorizontalPodAutoscaler",
"description": "HorizontalPodAutoscaler is the configuration for a horizontal pod autoscaler, which automatically manages the replica count of any resource implementing the scale subresource based on the metrics specified.",
"properties": {
"kind": {
@ -1218,11 +1218,11 @@
"description": "metadata is the standard object metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata"
},
"spec": {
"$ref": "v2alpha1.HorizontalPodAutoscalerSpec",
"$ref": "v2beta1.HorizontalPodAutoscalerSpec",
"description": "spec is the specification for the behaviour of the autoscaler. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status."
},
"status": {
"$ref": "v2alpha1.HorizontalPodAutoscalerStatus",
"$ref": "v2beta1.HorizontalPodAutoscalerStatus",
"description": "status is the current information about the autoscaler."
}
}
@ -1465,8 +1465,8 @@
}
}
},
"v2alpha1.HorizontalPodAutoscalerSpec": {
"id": "v2alpha1.HorizontalPodAutoscalerSpec",
"v2beta1.HorizontalPodAutoscalerSpec": {
"id": "v2beta1.HorizontalPodAutoscalerSpec",
"description": "HorizontalPodAutoscalerSpec describes the desired functionality of the HorizontalPodAutoscaler.",
"required": [
"scaleTargetRef",
@ -1474,7 +1474,7 @@
],
"properties": {
"scaleTargetRef": {
"$ref": "v2alpha1.CrossVersionObjectReference",
"$ref": "v2beta1.CrossVersionObjectReference",
"description": "scaleTargetRef points to the target resource to scale, and is used to the pods for which metrics should be collected, as well as to actually change the replica count."
},
"minReplicas": {
@ -1490,14 +1490,14 @@
"metrics": {
"type": "array",
"items": {
"$ref": "v2alpha1.MetricSpec"
"$ref": "v2beta1.MetricSpec"
},
"description": "metrics contains the specifications for which to use to calculate the desired replica count (the maximum replica count across all metrics will be used). The desired replica count is calculated multiplying the ratio between the target value and the current value by the current number of pods. Ergo, metrics used must decrease as the pod count is increased, and vice-versa. See the individual metric source types for more information about how each type of metric must respond."
}
}
},
"v2alpha1.CrossVersionObjectReference": {
"id": "v2alpha1.CrossVersionObjectReference",
"v2beta1.CrossVersionObjectReference": {
"id": "v2beta1.CrossVersionObjectReference",
"description": "CrossVersionObjectReference contains enough information to let you identify the referred resource.",
"required": [
"kind",
@ -1518,8 +1518,8 @@
}
}
},
"v2alpha1.MetricSpec": {
"id": "v2alpha1.MetricSpec",
"v2beta1.MetricSpec": {
"id": "v2beta1.MetricSpec",
"description": "MetricSpec specifies how to scale based on a single metric (only `type` and one other matching field should be set at once).",
"required": [
"type"
@ -1530,21 +1530,21 @@
"description": "type is the type of metric source. It should match one of the fields below."
},
"object": {
"$ref": "v2alpha1.ObjectMetricSource",
"$ref": "v2beta1.ObjectMetricSource",
"description": "object refers to a metric describing a single kubernetes object (for example, hits-per-second on an Ingress object)."
},
"pods": {
"$ref": "v2alpha1.PodsMetricSource",
"$ref": "v2beta1.PodsMetricSource",
"description": "pods refers to a metric describing each pod in the current scale target (for example, transactions-processed-per-second). The values will be averaged together before being compared to the target value."
},
"resource": {
"$ref": "v2alpha1.ResourceMetricSource",
"$ref": "v2beta1.ResourceMetricSource",
"description": "resource refers to a resource metric (such as those specified in requests and limits) known to Kubernetes describing each pod in the current scale target (e.g. CPU or memory). Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics using the \"pods\" source."
}
}
},
"v2alpha1.ObjectMetricSource": {
"id": "v2alpha1.ObjectMetricSource",
"v2beta1.ObjectMetricSource": {
"id": "v2beta1.ObjectMetricSource",
"description": "ObjectMetricSource indicates how to scale on a metric describing a kubernetes object (for example, hits-per-second on an Ingress object).",
"required": [
"target",
@ -1553,7 +1553,7 @@
],
"properties": {
"target": {
"$ref": "v2alpha1.CrossVersionObjectReference",
"$ref": "v2beta1.CrossVersionObjectReference",
"description": "target is the described Kubernetes object."
},
"metricName": {
@ -1566,8 +1566,8 @@
}
}
},
"v2alpha1.PodsMetricSource": {
"id": "v2alpha1.PodsMetricSource",
"v2beta1.PodsMetricSource": {
"id": "v2beta1.PodsMetricSource",
"description": "PodsMetricSource indicates how to scale on a metric describing each pod in the current scale target (for example, transactions-processed-per-second). The values will be averaged together before being compared to the target value.",
"required": [
"metricName",
@ -1584,8 +1584,8 @@
}
}
},
"v2alpha1.ResourceMetricSource": {
"id": "v2alpha1.ResourceMetricSource",
"v2beta1.ResourceMetricSource": {
"id": "v2beta1.ResourceMetricSource",
"description": "ResourceMetricSource indicates how to scale on a resource metric known to Kubernetes, as specified in requests and limits, describing each pod in the current scale target (e.g. CPU or memory). The values will be averaged together before being compared to the target. Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics using the \"pods\" source. Only one \"target\" type should be set.",
"required": [
"name"
@ -1606,8 +1606,8 @@
}
}
},
"v2alpha1.HorizontalPodAutoscalerStatus": {
"id": "v2alpha1.HorizontalPodAutoscalerStatus",
"v2beta1.HorizontalPodAutoscalerStatus": {
"id": "v2beta1.HorizontalPodAutoscalerStatus",
"description": "HorizontalPodAutoscalerStatus describes the current status of a horizontal pod autoscaler.",
"required": [
"currentReplicas",
@ -1638,21 +1638,21 @@
"currentMetrics": {
"type": "array",
"items": {
"$ref": "v2alpha1.MetricStatus"
"$ref": "v2beta1.MetricStatus"
},
"description": "currentMetrics is the last read state of the metrics used by this autoscaler."
},
"conditions": {
"type": "array",
"items": {
"$ref": "v2alpha1.HorizontalPodAutoscalerCondition"
"$ref": "v2beta1.HorizontalPodAutoscalerCondition"
},
"description": "conditions is the set of conditions required for this autoscaler to scale its target, and indicates whether or not those conditions are met."
}
}
},
"v2alpha1.MetricStatus": {
"id": "v2alpha1.MetricStatus",
"v2beta1.MetricStatus": {
"id": "v2beta1.MetricStatus",
"description": "MetricStatus describes the last-read state of a single metric.",
"required": [
"type"
@ -1663,21 +1663,21 @@
"description": "type is the type of metric source. It will match one of the fields below."
},
"object": {
"$ref": "v2alpha1.ObjectMetricStatus",
"$ref": "v2beta1.ObjectMetricStatus",
"description": "object refers to a metric describing a single kubernetes object (for example, hits-per-second on an Ingress object)."
},
"pods": {
"$ref": "v2alpha1.PodsMetricStatus",
"$ref": "v2beta1.PodsMetricStatus",
"description": "pods refers to a metric describing each pod in the current scale target (for example, transactions-processed-per-second). The values will be averaged together before being compared to the target value."
},
"resource": {
"$ref": "v2alpha1.ResourceMetricStatus",
"$ref": "v2beta1.ResourceMetricStatus",
"description": "resource refers to a resource metric (such as those specified in requests and limits) known to Kubernetes describing each pod in the current scale target (e.g. CPU or memory). Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics using the \"pods\" source."
}
}
},
"v2alpha1.ObjectMetricStatus": {
"id": "v2alpha1.ObjectMetricStatus",
"v2beta1.ObjectMetricStatus": {
"id": "v2beta1.ObjectMetricStatus",
"description": "ObjectMetricStatus indicates the current value of a metric describing a kubernetes object (for example, hits-per-second on an Ingress object).",
"required": [
"target",
@ -1686,7 +1686,7 @@
],
"properties": {
"target": {
"$ref": "v2alpha1.CrossVersionObjectReference",
"$ref": "v2beta1.CrossVersionObjectReference",
"description": "target is the described Kubernetes object."
},
"metricName": {
@ -1699,8 +1699,8 @@
}
}
},
"v2alpha1.PodsMetricStatus": {
"id": "v2alpha1.PodsMetricStatus",
"v2beta1.PodsMetricStatus": {
"id": "v2beta1.PodsMetricStatus",
"description": "PodsMetricStatus indicates the current value of a metric describing each pod in the current scale target (for example, transactions-processed-per-second).",
"required": [
"metricName",
@ -1717,8 +1717,8 @@
}
}
},
"v2alpha1.ResourceMetricStatus": {
"id": "v2alpha1.ResourceMetricStatus",
"v2beta1.ResourceMetricStatus": {
"id": "v2beta1.ResourceMetricStatus",
"description": "ResourceMetricStatus indicates the current value of a resource metric known to Kubernetes, as specified in requests and limits, describing each pod in the current scale target (e.g. CPU or memory). Such metrics are built in to Kubernetes, and have special scaling options on top of those available to normal per-pod metrics using the \"pods\" source.",
"required": [
"name",
@ -1740,8 +1740,8 @@
}
}
},
"v2alpha1.HorizontalPodAutoscalerCondition": {
"id": "v2alpha1.HorizontalPodAutoscalerCondition",
"v2beta1.HorizontalPodAutoscalerCondition": {
"id": "v2beta1.HorizontalPodAutoscalerCondition",
"description": "HorizontalPodAutoscalerCondition describes the state of a HorizontalPodAutoscaler at a certain point.",
"required": [
"type",

4
api/swagger-spec/resourceListing.json
View File

@ -50,8 +50,8 @@
"description": "API at /apis/autoscaling/v1"
},
{
"path": "/apis/autoscaling/v2alpha1",
"description": "API at /apis/autoscaling/v2alpha1"
"path": "/apis/autoscaling/v2beta1",
"description": "API at /apis/autoscaling/v2beta1"
},
{
"path": "/apis/autoscaling",

2
cmd/kube-apiserver/app/aggregator.go
View File

@ -206,7 +206,7 @@ var apiVersionPriorities = map[schema.GroupVersion]priority{
{Group: "authorization.k8s.io", Version: "v1"}: {group: 17600, version: 15},
{Group: "authorization.k8s.io", Version: "v1beta1"}: {group: 17600, version: 9},
{Group: "autoscaling", Version: "v1"}: {group: 17500, version: 15},
{Group: "autoscaling", Version: "v2alpha1"}: {group: 17500, version: 9},
{Group: "autoscaling", Version: "v2beta1"}: {group: 17500, version: 9},
{Group: "batch", Version: "v1"}: {group: 17400, version: 15},
{Group: "batch", Version: "v1beta1"}: {group: 17400, version: 9},
{Group: "batch", Version: "v2alpha1"}: {group: 17400, version: 9},

918
docs/api-reference/autoscaling/v2alpha1/definitions.html → docs/api-reference/autoscaling/v2beta1/definitions.html
View File

File diff suppressed because it is too large Load Diff

84
docs/api-reference/autoscaling/v2alpha1/operations.html → docs/api-reference/autoscaling/v2beta1/operations.html
View File

@ -371,7 +371,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_get_available_resources">get available resources</h3>
<div class="listingblock">
<div class="content">
<pre>GET /apis/autoscaling/v2alpha1</pre>
<pre>GET /apis/autoscaling/v2beta1</pre>
</div>
</div>
<div class="sect3">
@ -436,7 +436,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -446,7 +446,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_list_or_watch_objects_of_kind_horizontalpodautoscaler">list or watch objects of kind HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>GET /apis/autoscaling/v2alpha1/horizontalpodautoscalers</pre>
<pre>GET /apis/autoscaling/v2beta1/horizontalpodautoscalers</pre>
</div>
</div>
<div class="sect3">
@ -567,7 +567,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">200</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">success</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2alpha1_horizontalpodautoscalerlist">v2alpha1.HorizontalPodAutoscalerList</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2beta1_horizontalpodautoscalerlist">v2beta1.HorizontalPodAutoscalerList</a></p></td>
</tr>
</tbody>
</table>
@ -610,7 +610,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -620,7 +620,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_list_or_watch_objects_of_kind_horizontalpodautoscaler_2">list or watch objects of kind HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>GET /apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers</pre>
<pre>GET /apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers</pre>
</div>
</div>
<div class="sect3">
@ -749,7 +749,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">200</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">success</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2alpha1_horizontalpodautoscalerlist">v2alpha1.HorizontalPodAutoscalerList</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2beta1_horizontalpodautoscalerlist">v2beta1.HorizontalPodAutoscalerList</a></p></td>
</tr>
</tbody>
</table>
@ -792,7 +792,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -802,7 +802,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_delete_collection_of_horizontalpodautoscaler">delete collection of HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>DELETE /apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers</pre>
<pre>DELETE /apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers</pre>
</div>
</div>
<div class="sect3">
@ -968,7 +968,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -978,7 +978,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_create_a_horizontalpodautoscaler">create a HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>POST /apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers</pre>
<pre>POST /apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers</pre>
</div>
</div>
<div class="sect3">
@ -1016,7 +1016,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<td class="tableblock halign-left valign-top"><p class="tableblock">body</p></td>
<td class="tableblock halign-left valign-top"></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2alpha1_horizontalpodautoscaler">v2alpha1.HorizontalPodAutoscaler</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2beta1_horizontalpodautoscaler">v2beta1.HorizontalPodAutoscaler</a></p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
@ -1050,7 +1050,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">200</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">success</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2alpha1_horizontalpodautoscaler">v2alpha1.HorizontalPodAutoscaler</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2beta1_horizontalpodautoscaler">v2beta1.HorizontalPodAutoscaler</a></p></td>
</tr>
</tbody>
</table>
@ -1087,7 +1087,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -1097,7 +1097,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_read_the_specified_horizontalpodautoscaler">read the specified HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>GET /apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers/{name}</pre>
<pre>GET /apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}</pre>
</div>
</div>
<div class="sect3">
@ -1185,7 +1185,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">200</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">success</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2alpha1_horizontalpodautoscaler">v2alpha1.HorizontalPodAutoscaler</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2beta1_horizontalpodautoscaler">v2beta1.HorizontalPodAutoscaler</a></p></td>
</tr>
</tbody>
</table>
@ -1222,7 +1222,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -1232,7 +1232,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_replace_the_specified_horizontalpodautoscaler">replace the specified HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>PUT /apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers/{name}</pre>
<pre>PUT /apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}</pre>
</div>
</div>
<div class="sect3">
@ -1270,7 +1270,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<td class="tableblock halign-left valign-top"><p class="tableblock">body</p></td>
<td class="tableblock halign-left valign-top"></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2alpha1_horizontalpodautoscaler">v2alpha1.HorizontalPodAutoscaler</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2beta1_horizontalpodautoscaler">v2beta1.HorizontalPodAutoscaler</a></p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
@ -1312,7 +1312,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">200</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">success</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2alpha1_horizontalpodautoscaler">v2alpha1.HorizontalPodAutoscaler</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2beta1_horizontalpodautoscaler">v2beta1.HorizontalPodAutoscaler</a></p></td>
</tr>
</tbody>
</table>
@ -1349,7 +1349,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -1359,7 +1359,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_delete_a_horizontalpodautoscaler">delete a HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>DELETE /apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers/{name}</pre>
<pre>DELETE /apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}</pre>
</div>
</div>
<div class="sect3">
@ -1500,7 +1500,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -1510,7 +1510,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_partially_update_the_specified_horizontalpodautoscaler">partially update the specified HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>PATCH /apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers/{name}</pre>
<pre>PATCH /apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}</pre>
</div>
</div>
<div class="sect3">
@ -1590,7 +1590,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">200</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">success</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2alpha1_horizontalpodautoscaler">v2alpha1.HorizontalPodAutoscaler</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2beta1_horizontalpodautoscaler">v2beta1.HorizontalPodAutoscaler</a></p></td>
</tr>
</tbody>
</table>
@ -1633,7 +1633,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -1643,7 +1643,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_read_status_of_the_specified_horizontalpodautoscaler">read status of the specified HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>GET /apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status</pre>
<pre>GET /apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status</pre>
</div>
</div>
<div class="sect3">
@ -1715,7 +1715,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">200</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">success</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2alpha1_horizontalpodautoscaler">v2alpha1.HorizontalPodAutoscaler</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2beta1_horizontalpodautoscaler">v2beta1.HorizontalPodAutoscaler</a></p></td>
</tr>
</tbody>
</table>
@ -1752,7 +1752,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -1762,7 +1762,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_replace_status_of_the_specified_horizontalpodautoscaler">replace status of the specified HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>PUT /apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status</pre>
<pre>PUT /apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status</pre>
</div>
</div>
<div class="sect3">
@ -1800,7 +1800,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<td class="tableblock halign-left valign-top"><p class="tableblock">body</p></td>
<td class="tableblock halign-left valign-top"></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2alpha1_horizontalpodautoscaler">v2alpha1.HorizontalPodAutoscaler</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2beta1_horizontalpodautoscaler">v2beta1.HorizontalPodAutoscaler</a></p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
@ -1842,7 +1842,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">200</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">success</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2alpha1_horizontalpodautoscaler">v2alpha1.HorizontalPodAutoscaler</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2beta1_horizontalpodautoscaler">v2beta1.HorizontalPodAutoscaler</a></p></td>
</tr>
</tbody>
</table>
@ -1879,7 +1879,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -1889,7 +1889,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_partially_update_status_of_the_specified_horizontalpodautoscaler">partially update status of the specified HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>PATCH /apis/autoscaling/v2alpha1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status</pre>
<pre>PATCH /apis/autoscaling/v2beta1/namespaces/{namespace}/horizontalpodautoscalers/{name}/status</pre>
</div>
</div>
<div class="sect3">
@ -1969,7 +1969,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">200</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">success</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2alpha1_horizontalpodautoscaler">v2alpha1.HorizontalPodAutoscaler</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="../definitions#_v2beta1_horizontalpodautoscaler">v2beta1.HorizontalPodAutoscaler</a></p></td>
</tr>
</tbody>
</table>
@ -2012,7 +2012,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -2022,7 +2022,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_watch_individual_changes_to_a_list_of_horizontalpodautoscaler">watch individual changes to a list of HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>GET /apis/autoscaling/v2alpha1/watch/horizontalpodautoscalers</pre>
<pre>GET /apis/autoscaling/v2beta1/watch/horizontalpodautoscalers</pre>
</div>
</div>
<div class="sect3">
@ -2186,7 +2186,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -2196,7 +2196,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_watch_individual_changes_to_a_list_of_horizontalpodautoscaler_2">watch individual changes to a list of HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>GET /apis/autoscaling/v2alpha1/watch/namespaces/{namespace}/horizontalpodautoscalers</pre>
<pre>GET /apis/autoscaling/v2beta1/watch/namespaces/{namespace}/horizontalpodautoscalers</pre>
</div>
</div>
<div class="sect3">
@ -2368,7 +2368,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>
@ -2378,7 +2378,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<h3 id="_watch_changes_to_an_object_of_kind_horizontalpodautoscaler">watch changes to an object of kind HorizontalPodAutoscaler</h3>
<div class="listingblock">
<div class="content">
<pre>GET /apis/autoscaling/v2alpha1/watch/namespaces/{namespace}/horizontalpodautoscalers/{name}</pre>
<pre>GET /apis/autoscaling/v2beta1/watch/namespaces/{namespace}/horizontalpodautoscalers/{name}</pre>
</div>
</div>
<div class="sect3">
@ -2558,7 +2558,7 @@ span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
<div class="ulist">
<ul>
<li>
<p>apisautoscalingv2alpha1</p>
<p>apisautoscalingv2beta1</p>
</li>
</ul>
</div>

4
federation/apis/openapi-spec/swagger.json
View File

@ -14099,7 +14099,7 @@
},
{
"group": "autoscaling",
"version": "v2alpha1",
"version": "v2beta1",
"kind": "DeleteOptions"
},
{
@ -14613,7 +14613,7 @@
},
{
"group": "autoscaling",
"version": "v2alpha1",
"version": "v2beta1",
"kind": "WatchEvent"
},
{

6
hack/.golint_failures
View File

@ -511,7 +511,7 @@ staging/src/k8s.io/api/authentication/v1beta1
staging/src/k8s.io/api/authorization/v1
staging/src/k8s.io/api/authorization/v1beta1
staging/src/k8s.io/api/autoscaling/v1
staging/src/k8s.io/api/autoscaling/v2alpha1
staging/src/k8s.io/api/autoscaling/v2beta1
staging/src/k8s.io/api/batch/v1
staging/src/k8s.io/api/batch/v1beta1
staging/src/k8s.io/api/batch/v2alpha1
@ -696,8 +696,8 @@ staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1
staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake
staging/src/k8s.io/client-go/kubernetes/typed/batch/v1
staging/src/k8s.io/client-go/kubernetes/typed/batch/v1/fake
staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1

2
hack/lib/init.sh
View File

@ -61,7 +61,7 @@ authentication.k8s.io/v1beta1 \
authorization.k8s.io/v1 \
authorization.k8s.io/v1beta1 \
autoscaling/v1 \
autoscaling/v2alpha1 \
autoscaling/v2beta1 \
batch/v1 \
batch/v1beta1 \
batch/v2alpha1 \

4
pkg/api/defaulting_test.go
View File

@ -76,8 +76,8 @@ func TestDefaulting(t *testing.T) {
{Group: "apps", Version: "v1beta2", Kind: "StatefulSetList"}: {},
{Group: "autoscaling", Version: "v1", Kind: "HorizontalPodAutoscaler"}: {},
{Group: "autoscaling", Version: "v1", Kind: "HorizontalPodAutoscalerList"}: {},
{Group: "autoscaling", Version: "v2alpha1", Kind: "HorizontalPodAutoscaler"}: {},
{Group: "autoscaling", Version: "v2alpha1", Kind: "HorizontalPodAutoscalerList"}: {},
{Group: "autoscaling", Version: "v2beta1", Kind: "HorizontalPodAutoscaler"}: {},
{Group: "autoscaling", Version: "v2beta1", Kind: "HorizontalPodAutoscalerList"}: {},
{Group: "batch", Version: "v1", Kind: "Job"}: {},
{Group: "batch", Version: "v1", Kind: "JobList"}: {},
{Group: "batch", Version: "v1beta1", Kind: "CronJob"}: {},

2
pkg/apis/autoscaling/BUILD
View File

@ -38,7 +38,7 @@ filegroup(
"//pkg/apis/autoscaling/fuzzer:all-srcs",
"//pkg/apis/autoscaling/install:all-srcs",
"//pkg/apis/autoscaling/v1:all-srcs",
"//pkg/apis/autoscaling/v2alpha1:all-srcs",
"//pkg/apis/autoscaling/v2beta1:all-srcs",
"//pkg/apis/autoscaling/validation:all-srcs",
],
tags = ["automanaged"],

8
pkg/apis/autoscaling/annotations.go
View File

@ -17,18 +17,18 @@ limitations under the License.
package autoscaling
// MetricSpecsAnnotation is the annotation which holds non-CPU-utilization HPA metric
// specs when converting the `Metrics` field from autoscaling/v2alpha1
// specs when converting the `Metrics` field from autoscaling/v2beta1
const MetricSpecsAnnotation = "autoscaling.alpha.kubernetes.io/metrics"
// MetricStatusesAnnotation is the annotation which holds non-CPU-utilization HPA metric
// statuses when converting the `CurrentMetrics` field from autoscaling/v2alpha1
// statuses when converting the `CurrentMetrics` field from autoscaling/v2beta1
const MetricStatusesAnnotation = "autoscaling.alpha.kubernetes.io/current-metrics"
// HorizontalPodAutoscalerConditionsAnnotation is the annotation which holds the conditions
// of an HPA when converting the `Conditions` field from autoscaling/v2alpha1
// of an HPA when converting the `Conditions` field from autoscaling/v2beta1
const HorizontalPodAutoscalerConditionsAnnotation = "autoscaling.alpha.kubernetes.io/conditions"
// DefaultCPUUtilization is the default value for CPU utilization, provided no other
// metrics are present. This is here because it's used by both the v2alpha1 defaulting
// metrics are present. This is here because it's used by both the v2beta1 defaulting
// logic, and the pseudo-defaulting done in v1 conversion.
const DefaultCPUUtilization = 80

2
pkg/apis/autoscaling/install/BUILD
View File

@ -12,7 +12,7 @@ go_library(
"//pkg/api:go_default_library",
"//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/autoscaling/v1:go_default_library",
"//pkg/apis/autoscaling/v2alpha1:go_default_library",
"//pkg/apis/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apimachinery/announced:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apimachinery/registered:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",

8
pkg/apis/autoscaling/install/install.go
View File

@ -25,7 +25,7 @@ import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/autoscaling"
"k8s.io/kubernetes/pkg/apis/autoscaling/v1"
"k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
"k8s.io/kubernetes/pkg/apis/autoscaling/v2beta1"
)
func init() {
@ -37,12 +37,12 @@ func Install(groupFactoryRegistry announced.APIGroupFactoryRegistry, registry *r
if err := announced.NewGroupMetaFactory(
&announced.GroupMetaFactoryArgs{
GroupName: autoscaling.GroupName,
VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version, v2alpha1.SchemeGroupVersion.Version},
VersionPreferenceOrder: []string{v1.SchemeGroupVersion.Version, v2beta1.SchemeGroupVersion.Version},
AddInternalObjectsToScheme: autoscaling.AddToScheme,
},
announced.VersionToSchemeFunc{
v1.SchemeGroupVersion.Version: v1.AddToScheme,
v2alpha1.SchemeGroupVersion.Version: v2alpha1.AddToScheme,
v1.SchemeGroupVersion.Version: v1.AddToScheme,
v2beta1.SchemeGroupVersion.Version: v2beta1.AddToScheme,
},
).Announce(groupFactoryRegistry).RegisterAndEnable(registry, scheme); err != nil {
panic(err)

2
pkg/apis/autoscaling/types.go
View File

@ -351,7 +351,7 @@ type HorizontalPodAutoscaler struct {
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// HorizontalPodAutoscaler is a list of horizontal pod autoscaler objects.
// HorizontalPodAutoscalerList is a list of horizontal pod autoscaler objects.
type HorizontalPodAutoscalerList struct {
metav1.TypeMeta
// Metadata is the standard list metadata.

2
pkg/apis/autoscaling/v1/conversion.go
View File

@ -156,7 +156,7 @@ func Convert_v1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler(i
delete(out.Annotations, autoscaling.MetricStatusesAnnotation)
}
// autoscaling/v1 formerly had an implicit default applied in the controller. In v2alpha1, we apply it explicitly.
// autoscaling/v1 formerly had an implicit default applied in the controller. In v2beta1, we apply it explicitly.
// We apply it here, explicitly, since we have access to the full set of metrics from the annotation.
if len(out.Spec.Metrics) == 0 {
// no other metrics, no explicit CPU value set

438
pkg/apis/autoscaling/v2alpha1/zz_generated.conversion.go
View File

@ -1,438 +0,0 @@
// +build !ignore_autogenerated
/*
Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
// This file was autogenerated by conversion-gen. Do not edit it manually!
package v2alpha1
import (
v2alpha1 "k8s.io/api/autoscaling/v2alpha1"
v1 "k8s.io/api/core/v1"
resource "k8s.io/apimachinery/pkg/api/resource"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
api "k8s.io/kubernetes/pkg/api"
autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
unsafe "unsafe"
)
func init() {
localSchemeBuilder.Register(RegisterConversions)
}
// RegisterConversions adds conversion functions to the given scheme.
// Public to allow building arbitrary schemes.
func RegisterConversions(scheme *runtime.Scheme) error {
return scheme.AddGeneratedConversionFuncs(
Convert_v2alpha1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference,
Convert_autoscaling_CrossVersionObjectReference_To_v2alpha1_CrossVersionObjectReference,
Convert_v2alpha1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler,
Convert_autoscaling_HorizontalPodAutoscaler_To_v2alpha1_HorizontalPodAutoscaler,
Convert_v2alpha1_HorizontalPodAutoscalerCondition_To_autoscaling_HorizontalPodAutoscalerCondition,
Convert_autoscaling_HorizontalPodAutoscalerCondition_To_v2alpha1_HorizontalPodAutoscalerCondition,
Convert_v2alpha1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscalerList,
Convert_autoscaling_HorizontalPodAutoscalerList_To_v2alpha1_HorizontalPodAutoscalerList,
Convert_v2alpha1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec,
Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v2alpha1_HorizontalPodAutoscalerSpec,
Convert_v2alpha1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus,
Convert_autoscaling_HorizontalPodAutoscalerStatus_To_v2alpha1_HorizontalPodAutoscalerStatus,
Convert_v2alpha1_MetricSpec_To_autoscaling_MetricSpec,
Convert_autoscaling_MetricSpec_To_v2alpha1_MetricSpec,
Convert_v2alpha1_MetricStatus_To_autoscaling_MetricStatus,
Convert_autoscaling_MetricStatus_To_v2alpha1_MetricStatus,
Convert_v2alpha1_ObjectMetricSource_To_autoscaling_ObjectMetricSource,
Convert_autoscaling_ObjectMetricSource_To_v2alpha1_ObjectMetricSource,
Convert_v2alpha1_ObjectMetricStatus_To_autoscaling_ObjectMetricStatus,
Convert_autoscaling_ObjectMetricStatus_To_v2alpha1_ObjectMetricStatus,
Convert_v2alpha1_PodsMetricSource_To_autoscaling_PodsMetricSource,
Convert_autoscaling_PodsMetricSource_To_v2alpha1_PodsMetricSource,
Convert_v2alpha1_PodsMetricStatus_To_autoscaling_PodsMetricStatus,
Convert_autoscaling_PodsMetricStatus_To_v2alpha1_PodsMetricStatus,
Convert_v2alpha1_ResourceMetricSource_To_autoscaling_ResourceMetricSource,
Convert_autoscaling_ResourceMetricSource_To_v2alpha1_ResourceMetricSource,
Convert_v2alpha1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus,
Convert_autoscaling_ResourceMetricStatus_To_v2alpha1_ResourceMetricStatus,
)
}
func autoConvert_v2alpha1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(in *v2alpha1.CrossVersionObjectReference, out *autoscaling.CrossVersionObjectReference, s conversion.Scope) error {
out.Kind = in.Kind
out.Name = in.Name
out.APIVersion = in.APIVersion
return nil
}
// Convert_v2alpha1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference is an autogenerated conversion function.
func Convert_v2alpha1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(in *v2alpha1.CrossVersionObjectReference, out *autoscaling.CrossVersionObjectReference, s conversion.Scope) error {
return autoConvert_v2alpha1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(in, out, s)
}
func autoConvert_autoscaling_CrossVersionObjectReference_To_v2alpha1_CrossVersionObjectReference(in *autoscaling.CrossVersionObjectReference, out *v2alpha1.CrossVersionObjectReference, s conversion.Scope) error {
out.Kind = in.Kind
out.Name = in.Name
out.APIVersion = in.APIVersion
return nil
}
// Convert_autoscaling_CrossVersionObjectReference_To_v2alpha1_CrossVersionObjectReference is an autogenerated conversion function.
func Convert_autoscaling_CrossVersionObjectReference_To_v2alpha1_CrossVersionObjectReference(in *autoscaling.CrossVersionObjectReference, out *v2alpha1.CrossVersionObjectReference, s conversion.Scope) error {
return autoConvert_autoscaling_CrossVersionObjectReference_To_v2alpha1_CrossVersionObjectReference(in, out, s)
}
func autoConvert_v2alpha1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler(in *v2alpha1.HorizontalPodAutoscaler, out *autoscaling.HorizontalPodAutoscaler, s conversion.Scope) error {
out.ObjectMeta = in.ObjectMeta
if err := Convert_v2alpha1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}
if err := Convert_v2alpha1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, s); err != nil {
return err
}
return nil
}
// Convert_v2alpha1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler is an autogenerated conversion function.
func Convert_v2alpha1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler(in *v2alpha1.HorizontalPodAutoscaler, out *autoscaling.HorizontalPodAutoscaler, s conversion.Scope) error {
return autoConvert_v2alpha1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler(in, out, s)
}
func autoConvert_autoscaling_HorizontalPodAutoscaler_To_v2alpha1_HorizontalPodAutoscaler(in *autoscaling.HorizontalPodAutoscaler, out *v2alpha1.HorizontalPodAutoscaler, s conversion.Scope) error {
out.ObjectMeta = in.ObjectMeta
if err := Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v2alpha1_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}
if err := Convert_autoscaling_HorizontalPodAutoscalerStatus_To_v2alpha1_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, s); err != nil {
return err
}
return nil
}
// Convert_autoscaling_HorizontalPodAutoscaler_To_v2alpha1_HorizontalPodAutoscaler is an autogenerated conversion function.
func Convert_autoscaling_HorizontalPodAutoscaler_To_v2alpha1_HorizontalPodAutoscaler(in *autoscaling.HorizontalPodAutoscaler, out *v2alpha1.HorizontalPodAutoscaler, s conversion.Scope) error {
return autoConvert_autoscaling_HorizontalPodAutoscaler_To_v2alpha1_HorizontalPodAutoscaler(in, out, s)
}
func autoConvert_v2alpha1_HorizontalPodAutoscalerCondition_To_autoscaling_HorizontalPodAutoscalerCondition(in *v2alpha1.HorizontalPodAutoscalerCondition, out *autoscaling.HorizontalPodAutoscalerCondition, s conversion.Scope) error {
out.Type = autoscaling.HorizontalPodAutoscalerConditionType(in.Type)
out.Status = autoscaling.ConditionStatus(in.Status)
out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason
out.Message = in.Message
return nil
}
// Convert_v2alpha1_HorizontalPodAutoscalerCondition_To_autoscaling_HorizontalPodAutoscalerCondition is an autogenerated conversion function.
func Convert_v2alpha1_HorizontalPodAutoscalerCondition_To_autoscaling_HorizontalPodAutoscalerCondition(in *v2alpha1.HorizontalPodAutoscalerCondition, out *autoscaling.HorizontalPodAutoscalerCondition, s conversion.Scope) error {
return autoConvert_v2alpha1_HorizontalPodAutoscalerCondition_To_autoscaling_HorizontalPodAutoscalerCondition(in, out, s)
}
func autoConvert_autoscaling_HorizontalPodAutoscalerCondition_To_v2alpha1_HorizontalPodAutoscalerCondition(in *autoscaling.HorizontalPodAutoscalerCondition, out *v2alpha1.HorizontalPodAutoscalerCondition, s conversion.Scope) error {
out.Type = v2alpha1.HorizontalPodAutoscalerConditionType(in.Type)
out.Status = v1.ConditionStatus(in.Status)
out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason
out.Message = in.Message
return nil
}
// Convert_autoscaling_HorizontalPodAutoscalerCondition_To_v2alpha1_HorizontalPodAutoscalerCondition is an autogenerated conversion function.
func Convert_autoscaling_HorizontalPodAutoscalerCondition_To_v2alpha1_HorizontalPodAutoscalerCondition(in *autoscaling.HorizontalPodAutoscalerCondition, out *v2alpha1.HorizontalPodAutoscalerCondition, s conversion.Scope) error {
return autoConvert_autoscaling_HorizontalPodAutoscalerCondition_To_v2alpha1_HorizontalPodAutoscalerCondition(in, out, s)
}
func autoConvert_v2alpha1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscalerList(in *v2alpha1.HorizontalPodAutoscalerList, out *autoscaling.HorizontalPodAutoscalerList, s conversion.Scope) error {
out.ListMeta = in.ListMeta
out.Items = *(*[]autoscaling.HorizontalPodAutoscaler)(unsafe.Pointer(&in.Items))
return nil
}
// Convert_v2alpha1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscalerList is an autogenerated conversion function.
func Convert_v2alpha1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscalerList(in *v2alpha1.HorizontalPodAutoscalerList, out *autoscaling.HorizontalPodAutoscalerList, s conversion.Scope) error {
return autoConvert_v2alpha1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscalerList(in, out, s)
}
func autoConvert_autoscaling_HorizontalPodAutoscalerList_To_v2alpha1_HorizontalPodAutoscalerList(in *autoscaling.HorizontalPodAutoscalerList, out *v2alpha1.HorizontalPodAutoscalerList, s conversion.Scope) error {
out.ListMeta = in.ListMeta
out.Items = *(*[]v2alpha1.HorizontalPodAutoscaler)(unsafe.Pointer(&in.Items))
return nil
}
// Convert_autoscaling_HorizontalPodAutoscalerList_To_v2alpha1_HorizontalPodAutoscalerList is an autogenerated conversion function.
func Convert_autoscaling_HorizontalPodAutoscalerList_To_v2alpha1_HorizontalPodAutoscalerList(in *autoscaling.HorizontalPodAutoscalerList, out *v2alpha1.HorizontalPodAutoscalerList, s conversion.Scope) error {
return autoConvert_autoscaling_HorizontalPodAutoscalerList_To_v2alpha1_HorizontalPodAutoscalerList(in, out, s)
}
func autoConvert_v2alpha1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec(in *v2alpha1.HorizontalPodAutoscalerSpec, out *autoscaling.HorizontalPodAutoscalerSpec, s conversion.Scope) error {
if err := Convert_v2alpha1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(&in.ScaleTargetRef, &out.ScaleTargetRef, s); err != nil {
return err
}
out.MinReplicas = (*int32)(unsafe.Pointer(in.MinReplicas))
out.MaxReplicas = in.MaxReplicas
out.Metrics = *(*[]autoscaling.MetricSpec)(unsafe.Pointer(&in.Metrics))
return nil
}
// Convert_v2alpha1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec is an autogenerated conversion function.
func Convert_v2alpha1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec(in *v2alpha1.HorizontalPodAutoscalerSpec, out *autoscaling.HorizontalPodAutoscalerSpec, s conversion.Scope) error {
return autoConvert_v2alpha1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec(in, out, s)
}
func autoConvert_autoscaling_HorizontalPodAutoscalerSpec_To_v2alpha1_HorizontalPodAutoscalerSpec(in *autoscaling.HorizontalPodAutoscalerSpec, out *v2alpha1.HorizontalPodAutoscalerSpec, s conversion.Scope) error {
if err := Convert_autoscaling_CrossVersionObjectReference_To_v2alpha1_CrossVersionObjectReference(&in.ScaleTargetRef, &out.ScaleTargetRef, s); err != nil {
return err
}
out.MinReplicas = (*int32)(unsafe.Pointer(in.MinReplicas))
out.MaxReplicas = in.MaxReplicas
out.Metrics = *(*[]v2alpha1.MetricSpec)(unsafe.Pointer(&in.Metrics))
return nil
}
// Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v2alpha1_HorizontalPodAutoscalerSpec is an autogenerated conversion function.
func Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v2alpha1_HorizontalPodAutoscalerSpec(in *autoscaling.HorizontalPodAutoscalerSpec, out *v2alpha1.HorizontalPodAutoscalerSpec, s conversion.Scope) error {
return autoConvert_autoscaling_HorizontalPodAutoscalerSpec_To_v2alpha1_HorizontalPodAutoscalerSpec(in, out, s)
}
func autoConvert_v2alpha1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *v2alpha1.HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration))
out.LastScaleTime = (*meta_v1.Time)(unsafe.Pointer(in.LastScaleTime))
out.CurrentReplicas = in.CurrentReplicas
out.DesiredReplicas = in.DesiredReplicas
out.CurrentMetrics = *(*[]autoscaling.MetricStatus)(unsafe.Pointer(&in.CurrentMetrics))
out.Conditions = *(*[]autoscaling.HorizontalPodAutoscalerCondition)(unsafe.Pointer(&in.Conditions))
return nil
}
// Convert_v2alpha1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus is an autogenerated conversion function.
func Convert_v2alpha1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *v2alpha1.HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
return autoConvert_v2alpha1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in, out, s)
}
func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v2alpha1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *v2alpha1.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration))
out.LastScaleTime = (*meta_v1.Time)(unsafe.Pointer(in.LastScaleTime))
out.CurrentReplicas = in.CurrentReplicas
out.DesiredReplicas = in.DesiredReplicas
out.CurrentMetrics = *(*[]v2alpha1.MetricStatus)(unsafe.Pointer(&in.CurrentMetrics))
out.Conditions = *(*[]v2alpha1.HorizontalPodAutoscalerCondition)(unsafe.Pointer(&in.Conditions))
return nil
}
// Convert_autoscaling_HorizontalPodAutoscalerStatus_To_v2alpha1_HorizontalPodAutoscalerStatus is an autogenerated conversion function.
func Convert_autoscaling_HorizontalPodAutoscalerStatus_To_v2alpha1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *v2alpha1.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
return autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v2alpha1_HorizontalPodAutoscalerStatus(in, out, s)
}
func autoConvert_v2alpha1_MetricSpec_To_autoscaling_MetricSpec(in *v2alpha1.MetricSpec, out *autoscaling.MetricSpec, s conversion.Scope) error {
out.Type = autoscaling.MetricSourceType(in.Type)
out.Object = (*autoscaling.ObjectMetricSource)(unsafe.Pointer(in.Object))
out.Pods = (*autoscaling.PodsMetricSource)(unsafe.Pointer(in.Pods))
out.Resource = (*autoscaling.ResourceMetricSource)(unsafe.Pointer(in.Resource))
return nil
}
// Convert_v2alpha1_MetricSpec_To_autoscaling_MetricSpec is an autogenerated conversion function.
func Convert_v2alpha1_MetricSpec_To_autoscaling_MetricSpec(in *v2alpha1.MetricSpec, out *autoscaling.MetricSpec, s conversion.Scope) error {
return autoConvert_v2alpha1_MetricSpec_To_autoscaling_MetricSpec(in, out, s)
}
func autoConvert_autoscaling_MetricSpec_To_v2alpha1_MetricSpec(in *autoscaling.MetricSpec, out *v2alpha1.MetricSpec, s conversion.Scope) error {
out.Type = v2alpha1.MetricSourceType(in.Type)
out.Object = (*v2alpha1.ObjectMetricSource)(unsafe.Pointer(in.Object))
out.Pods = (*v2alpha1.PodsMetricSource)(unsafe.Pointer(in.Pods))
out.Resource = (*v2alpha1.ResourceMetricSource)(unsafe.Pointer(in.Resource))
return nil
}
// Convert_autoscaling_MetricSpec_To_v2alpha1_MetricSpec is an autogenerated conversion function.
func Convert_autoscaling_MetricSpec_To_v2alpha1_MetricSpec(in *autoscaling.MetricSpec, out *v2alpha1.MetricSpec, s conversion.Scope) error {
return autoConvert_autoscaling_MetricSpec_To_v2alpha1_MetricSpec(in, out, s)
}
func autoConvert_v2alpha1_MetricStatus_To_autoscaling_MetricStatus(in *v2alpha1.MetricStatus, out *autoscaling.MetricStatus, s conversion.Scope) error {
out.Type = autoscaling.MetricSourceType(in.Type)
out.Object = (*autoscaling.ObjectMetricStatus)(unsafe.Pointer(in.Object))
out.Pods = (*autoscaling.PodsMetricStatus)(unsafe.Pointer(in.Pods))
out.Resource = (*autoscaling.ResourceMetricStatus)(unsafe.Pointer(in.Resource))
return nil
}
// Convert_v2alpha1_MetricStatus_To_autoscaling_MetricStatus is an autogenerated conversion function.
func Convert_v2alpha1_MetricStatus_To_autoscaling_MetricStatus(in *v2alpha1.MetricStatus, out *autoscaling.MetricStatus, s conversion.Scope) error {
return autoConvert_v2alpha1_MetricStatus_To_autoscaling_MetricStatus(in, out, s)
}
func autoConvert_autoscaling_MetricStatus_To_v2alpha1_MetricStatus(in *autoscaling.MetricStatus, out *v2alpha1.MetricStatus, s conversion.Scope) error {
out.Type = v2alpha1.MetricSourceType(in.Type)
out.Object = (*v2alpha1.ObjectMetricStatus)(unsafe.Pointer(in.Object))
out.Pods = (*v2alpha1.PodsMetricStatus)(unsafe.Pointer(in.Pods))
out.Resource = (*v2alpha1.ResourceMetricStatus)(unsafe.Pointer(in.Resource))
return nil
}
// Convert_autoscaling_MetricStatus_To_v2alpha1_MetricStatus is an autogenerated conversion function.
func Convert_autoscaling_MetricStatus_To_v2alpha1_MetricStatus(in *autoscaling.MetricStatus, out *v2alpha1.MetricStatus, s conversion.Scope) error {
return autoConvert_autoscaling_MetricStatus_To_v2alpha1_MetricStatus(in, out, s)
}
func autoConvert_v2alpha1_ObjectMetricSource_To_autoscaling_ObjectMetricSource(in *v2alpha1.ObjectMetricSource, out *autoscaling.ObjectMetricSource, s conversion.Scope) error {
if err := Convert_v2alpha1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(&in.Target, &out.Target, s); err != nil {
return err
}
out.MetricName = in.MetricName
out.TargetValue = in.TargetValue
return nil
}
// Convert_v2alpha1_ObjectMetricSource_To_autoscaling_ObjectMetricSource is an autogenerated conversion function.
func Convert_v2alpha1_ObjectMetricSource_To_autoscaling_ObjectMetricSource(in *v2alpha1.ObjectMetricSource, out *autoscaling.ObjectMetricSource, s conversion.Scope) error {
return autoConvert_v2alpha1_ObjectMetricSource_To_autoscaling_ObjectMetricSource(in, out, s)
}
func autoConvert_autoscaling_ObjectMetricSource_To_v2alpha1_ObjectMetricSource(in *autoscaling.ObjectMetricSource, out *v2alpha1.ObjectMetricSource, s conversion.Scope) error {
if err := Convert_autoscaling_CrossVersionObjectReference_To_v2alpha1_CrossVersionObjectReference(&in.Target, &out.Target, s); err != nil {
return err
}
out.MetricName = in.MetricName
out.TargetValue = in.TargetValue
return nil
}
// Convert_autoscaling_ObjectMetricSource_To_v2alpha1_ObjectMetricSource is an autogenerated conversion function.
func Convert_autoscaling_ObjectMetricSource_To_v2alpha1_ObjectMetricSource(in *autoscaling.ObjectMetricSource, out *v2alpha1.ObjectMetricSource, s conversion.Scope) error {
return autoConvert_autoscaling_ObjectMetricSource_To_v2alpha1_ObjectMetricSource(in, out, s)
}
func autoConvert_v2alpha1_ObjectMetricStatus_To_autoscaling_ObjectMetricStatus(in *v2alpha1.ObjectMetricStatus, out *autoscaling.ObjectMetricStatus, s conversion.Scope) error {
if err := Convert_v2alpha1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(&in.Target, &out.Target, s); err != nil {
return err
}
out.MetricName = in.MetricName
out.CurrentValue = in.CurrentValue
return nil
}
// Convert_v2alpha1_ObjectMetricStatus_To_autoscaling_ObjectMetricStatus is an autogenerated conversion function.
func Convert_v2alpha1_ObjectMetricStatus_To_autoscaling_ObjectMetricStatus(in *v2alpha1.ObjectMetricStatus, out *autoscaling.ObjectMetricStatus, s conversion.Scope) error {
return autoConvert_v2alpha1_ObjectMetricStatus_To_autoscaling_ObjectMetricStatus(in, out, s)
}
func autoConvert_autoscaling_ObjectMetricStatus_To_v2alpha1_ObjectMetricStatus(in *autoscaling.ObjectMetricStatus, out *v2alpha1.ObjectMetricStatus, s conversion.Scope) error {
if err := Convert_autoscaling_CrossVersionObjectReference_To_v2alpha1_CrossVersionObjectReference(&in.Target, &out.Target, s); err != nil {
return err
}
out.MetricName = in.MetricName
out.CurrentValue = in.CurrentValue
return nil
}
// Convert_autoscaling_ObjectMetricStatus_To_v2alpha1_ObjectMetricStatus is an autogenerated conversion function.
func Convert_autoscaling_ObjectMetricStatus_To_v2alpha1_ObjectMetricStatus(in *autoscaling.ObjectMetricStatus, out *v2alpha1.ObjectMetricStatus, s conversion.Scope) error {
return autoConvert_autoscaling_ObjectMetricStatus_To_v2alpha1_ObjectMetricStatus(in, out, s)
}
func autoConvert_v2alpha1_PodsMetricSource_To_autoscaling_PodsMetricSource(in *v2alpha1.PodsMetricSource, out *autoscaling.PodsMetricSource, s conversion.Scope) error {
out.MetricName = in.MetricName
out.TargetAverageValue = in.TargetAverageValue
return nil
}
// Convert_v2alpha1_PodsMetricSource_To_autoscaling_PodsMetricSource is an autogenerated conversion function.
func Convert_v2alpha1_PodsMetricSource_To_autoscaling_PodsMetricSource(in *v2alpha1.PodsMetricSource, out *autoscaling.PodsMetricSource, s conversion.Scope) error {
return autoConvert_v2alpha1_PodsMetricSource_To_autoscaling_PodsMetricSource(in, out, s)
}
func autoConvert_autoscaling_PodsMetricSource_To_v2alpha1_PodsMetricSource(in *autoscaling.PodsMetricSource, out *v2alpha1.PodsMetricSource, s conversion.Scope) error {
out.MetricName = in.MetricName
out.TargetAverageValue = in.TargetAverageValue
return nil
}
// Convert_autoscaling_PodsMetricSource_To_v2alpha1_PodsMetricSource is an autogenerated conversion function.
func Convert_autoscaling_PodsMetricSource_To_v2alpha1_PodsMetricSource(in *autoscaling.PodsMetricSource, out *v2alpha1.PodsMetricSource, s conversion.Scope) error {
return autoConvert_autoscaling_PodsMetricSource_To_v2alpha1_PodsMetricSource(in, out, s)
}
func autoConvert_v2alpha1_PodsMetricStatus_To_autoscaling_PodsMetricStatus(in *v2alpha1.PodsMetricStatus, out *autoscaling.PodsMetricStatus, s conversion.Scope) error {
out.MetricName = in.MetricName
out.CurrentAverageValue = in.CurrentAverageValue
return nil
}
// Convert_v2alpha1_PodsMetricStatus_To_autoscaling_PodsMetricStatus is an autogenerated conversion function.
func Convert_v2alpha1_PodsMetricStatus_To_autoscaling_PodsMetricStatus(in *v2alpha1.PodsMetricStatus, out *autoscaling.PodsMetricStatus, s conversion.Scope) error {
return autoConvert_v2alpha1_PodsMetricStatus_To_autoscaling_PodsMetricStatus(in, out, s)
}
func autoConvert_autoscaling_PodsMetricStatus_To_v2alpha1_PodsMetricStatus(in *autoscaling.PodsMetricStatus, out *v2alpha1.PodsMetricStatus, s conversion.Scope) error {
out.MetricName = in.MetricName
out.CurrentAverageValue = in.CurrentAverageValue
return nil
}
// Convert_autoscaling_PodsMetricStatus_To_v2alpha1_PodsMetricStatus is an autogenerated conversion function.
func Convert_autoscaling_PodsMetricStatus_To_v2alpha1_PodsMetricStatus(in *autoscaling.PodsMetricStatus, out *v2alpha1.PodsMetricStatus, s conversion.Scope) error {
return autoConvert_autoscaling_PodsMetricStatus_To_v2alpha1_PodsMetricStatus(in, out, s)
}
func autoConvert_v2alpha1_ResourceMetricSource_To_autoscaling_ResourceMetricSource(in *v2alpha1.ResourceMetricSource, out *autoscaling.ResourceMetricSource, s conversion.Scope) error {
out.Name = api.ResourceName(in.Name)
out.TargetAverageUtilization = (*int32)(unsafe.Pointer(in.TargetAverageUtilization))
out.TargetAverageValue = (*resource.Quantity)(unsafe.Pointer(in.TargetAverageValue))
return nil
}
// Convert_v2alpha1_ResourceMetricSource_To_autoscaling_ResourceMetricSource is an autogenerated conversion function.
func Convert_v2alpha1_ResourceMetricSource_To_autoscaling_ResourceMetricSource(in *v2alpha1.ResourceMetricSource, out *autoscaling.ResourceMetricSource, s conversion.Scope) error {
return autoConvert_v2alpha1_ResourceMetricSource_To_autoscaling_ResourceMetricSource(in, out, s)
}
func autoConvert_autoscaling_ResourceMetricSource_To_v2alpha1_ResourceMetricSource(in *autoscaling.ResourceMetricSource, out *v2alpha1.ResourceMetricSource, s conversion.Scope) error {
out.Name = v1.ResourceName(in.Name)
out.TargetAverageUtilization = (*int32)(unsafe.Pointer(in.TargetAverageUtilization))
out.TargetAverageValue = (*resource.Quantity)(unsafe.Pointer(in.TargetAverageValue))
return nil
}
// Convert_autoscaling_ResourceMetricSource_To_v2alpha1_ResourceMetricSource is an autogenerated conversion function.
func Convert_autoscaling_ResourceMetricSource_To_v2alpha1_ResourceMetricSource(in *autoscaling.ResourceMetricSource, out *v2alpha1.ResourceMetricSource, s conversion.Scope) error {
return autoConvert_autoscaling_ResourceMetricSource_To_v2alpha1_ResourceMetricSource(in, out, s)
}
func autoConvert_v2alpha1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus(in *v2alpha1.ResourceMetricStatus, out *autoscaling.ResourceMetricStatus, s conversion.Scope) error {
out.Name = api.ResourceName(in.Name)
out.CurrentAverageUtilization = (*int32)(unsafe.Pointer(in.CurrentAverageUtilization))
out.CurrentAverageValue = in.CurrentAverageValue
return nil
}
// Convert_v2alpha1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus is an autogenerated conversion function.
func Convert_v2alpha1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus(in *v2alpha1.ResourceMetricStatus, out *autoscaling.ResourceMetricStatus, s conversion.Scope) error {
return autoConvert_v2alpha1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus(in, out, s)
}
func autoConvert_autoscaling_ResourceMetricStatus_To_v2alpha1_ResourceMetricStatus(in *autoscaling.ResourceMetricStatus, out *v2alpha1.ResourceMetricStatus, s conversion.Scope) error {
out.Name = v1.ResourceName(in.Name)
out.CurrentAverageUtilization = (*int32)(unsafe.Pointer(in.CurrentAverageUtilization))
out.CurrentAverageValue = in.CurrentAverageValue
return nil
}
// Convert_autoscaling_ResourceMetricStatus_To_v2alpha1_ResourceMetricStatus is an autogenerated conversion function.
func Convert_autoscaling_ResourceMetricStatus_To_v2alpha1_ResourceMetricStatus(in *autoscaling.ResourceMetricStatus, out *v2alpha1.ResourceMetricStatus, s conversion.Scope) error {
return autoConvert_autoscaling_ResourceMetricStatus_To_v2alpha1_ResourceMetricStatus(in, out, s)
}

4
pkg/apis/autoscaling/v2alpha1/BUILD → pkg/apis/autoscaling/v2beta1/BUILD
View File

@ -18,7 +18,7 @@ go_library(
deps = [
"//pkg/api:go_default_library",
"//pkg/apis/autoscaling:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@ -50,7 +50,7 @@ go_test(
"//pkg/api/install:go_default_library",
"//pkg/apis/autoscaling:go_default_library",
"//pkg/apis/autoscaling/install:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",

12
pkg/apis/autoscaling/v2alpha1/defaults.go → pkg/apis/autoscaling/v2beta1/defaults.go
View File

@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package v2alpha1
package v2beta1
import (
autoscalingv2alpha1 "k8s.io/api/autoscaling/v2alpha1"
autoscalingv2beta1 "k8s.io/api/autoscaling/v2beta1"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/apis/autoscaling"
@ -27,7 +27,7 @@ func addDefaultingFuncs(scheme *runtime.Scheme) error {
return RegisterDefaults(scheme)
}
func SetDefaults_HorizontalPodAutoscaler(obj *autoscalingv2alpha1.HorizontalPodAutoscaler) {
func SetDefaults_HorizontalPodAutoscaler(obj *autoscalingv2beta1.HorizontalPodAutoscaler) {
if obj.Spec.MinReplicas == nil {
minReplicas := int32(1)
obj.Spec.MinReplicas = &minReplicas
@ -35,10 +35,10 @@ func SetDefaults_HorizontalPodAutoscaler(obj *autoscalingv2alpha1.HorizontalPodA
if len(obj.Spec.Metrics) == 0 {
utilizationDefaultVal := int32(autoscaling.DefaultCPUUtilization)
obj.Spec.Metrics = []autoscalingv2alpha1.MetricSpec{
obj.Spec.Metrics = []autoscalingv2beta1.MetricSpec{
{
Type: autoscalingv2alpha1.ResourceMetricSourceType,
Resource: &autoscalingv2alpha1.ResourceMetricSource{
Type: autoscalingv2beta1.ResourceMetricSourceType,
Resource: &autoscalingv2beta1.ResourceMetricSource{
Name: v1.ResourceCPU,
TargetAverageUtilization: &utilizationDefaultVal,
},

42
pkg/apis/autoscaling/v2alpha1/defaults_test.go → pkg/apis/autoscaling/v2beta1/defaults_test.go
View File

@ -14,13 +14,13 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package v2alpha1_test
package v2beta1_test
import (
"reflect"
"testing"
autoscalingv2alpha1 "k8s.io/api/autoscaling/v2alpha1"
autoscalingv2beta1 "k8s.io/api/autoscaling/v2beta1"
"k8s.io/api/core/v1"
apiequality "k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/runtime"
@ -28,16 +28,16 @@ import (
_ "k8s.io/kubernetes/pkg/api/install"
"k8s.io/kubernetes/pkg/apis/autoscaling"
_ "k8s.io/kubernetes/pkg/apis/autoscaling/install"
. "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
. "k8s.io/kubernetes/pkg/apis/autoscaling/v2beta1"
)
func TestSetDefaultHPA(t *testing.T) {
utilizationDefaultVal := int32(autoscaling.DefaultCPUUtilization)
defaultReplicas := newInt32(1)
defaultTemplate := []autoscalingv2alpha1.MetricSpec{
defaultTemplate := []autoscalingv2beta1.MetricSpec{
{
Type: autoscalingv2alpha1.ResourceMetricSourceType,
Resource: &autoscalingv2alpha1.ResourceMetricSource{
Type: autoscalingv2beta1.ResourceMetricSourceType,
Resource: &autoscalingv2beta1.ResourceMetricSource{
Name: v1.ResourceCPU,
TargetAverageUtilization: &utilizationDefaultVal,
},
@ -45,44 +45,44 @@ func TestSetDefaultHPA(t *testing.T) {
}
tests := []struct {
original *autoscalingv2alpha1.HorizontalPodAutoscaler
expected *autoscalingv2alpha1.HorizontalPodAutoscaler
original *autoscalingv2beta1.HorizontalPodAutoscaler
expected *autoscalingv2beta1.HorizontalPodAutoscaler
}{
{ // MinReplicas default value
original: &autoscalingv2alpha1.HorizontalPodAutoscaler{
Spec: autoscalingv2alpha1.HorizontalPodAutoscalerSpec{
original: &autoscalingv2beta1.HorizontalPodAutoscaler{
Spec: autoscalingv2beta1.HorizontalPodAutoscalerSpec{
Metrics: defaultTemplate,
},
},
expected: &autoscalingv2alpha1.HorizontalPodAutoscaler{
Spec: autoscalingv2alpha1.HorizontalPodAutoscalerSpec{
expected: &autoscalingv2beta1.HorizontalPodAutoscaler{
Spec: autoscalingv2beta1.HorizontalPodAutoscalerSpec{
MinReplicas: defaultReplicas,
Metrics: defaultTemplate,
},
},
},
{ // MinReplicas update
original: &autoscalingv2alpha1.HorizontalPodAutoscaler{
Spec: autoscalingv2alpha1.HorizontalPodAutoscalerSpec{
original: &autoscalingv2beta1.HorizontalPodAutoscaler{
Spec: autoscalingv2beta1.HorizontalPodAutoscalerSpec{
MinReplicas: newInt32(3),
Metrics: defaultTemplate,
},
},
expected: &autoscalingv2alpha1.HorizontalPodAutoscaler{
Spec: autoscalingv2alpha1.HorizontalPodAutoscalerSpec{
expected: &autoscalingv2beta1.HorizontalPodAutoscaler{
Spec: autoscalingv2beta1.HorizontalPodAutoscalerSpec{
MinReplicas: newInt32(3),
Metrics: defaultTemplate,
},
},
},
{ // Metrics default value
original: &autoscalingv2alpha1.HorizontalPodAutoscaler{
Spec: autoscalingv2alpha1.HorizontalPodAutoscalerSpec{
original: &autoscalingv2beta1.HorizontalPodAutoscaler{
Spec: autoscalingv2beta1.HorizontalPodAutoscalerSpec{
MinReplicas: defaultReplicas,
},
},
expected: &autoscalingv2alpha1.HorizontalPodAutoscaler{
Spec: autoscalingv2alpha1.HorizontalPodAutoscalerSpec{
expected: &autoscalingv2beta1.HorizontalPodAutoscaler{
Spec: autoscalingv2beta1.HorizontalPodAutoscalerSpec{
MinReplicas: defaultReplicas,
Metrics: defaultTemplate,
},
@ -94,7 +94,7 @@ func TestSetDefaultHPA(t *testing.T) {
original := test.original
expected := test.expected
obj2 := roundTrip(t, runtime.Object(original))
got, ok := obj2.(*autoscalingv2alpha1.HorizontalPodAutoscaler)
got, ok := obj2.(*autoscalingv2beta1.HorizontalPodAutoscaler)
if !ok {
t.Fatalf("(%d) unexpected object: %v", i, obj2)
}

6
pkg/apis/autoscaling/v2alpha1/doc.go → pkg/apis/autoscaling/v2beta1/doc.go
View File

@ -15,8 +15,8 @@ limitations under the License.
*/
// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/autoscaling
// +k8s:conversion-gen-external-types=../../../../vendor/k8s.io/api/autoscaling/v2alpha1
// +k8s:conversion-gen-external-types=../../../../vendor/k8s.io/api/autoscaling/v2beta1
// +k8s:defaulter-gen=TypeMeta
// +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/autoscaling/v2alpha1
// +k8s:defaulter-gen-input=../../../../vendor/k8s.io/api/autoscaling/v2beta1
package v2alpha1 // import "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"
package v2beta1 // import "k8s.io/kubernetes/pkg/apis/autoscaling/v2beta1"

8
pkg/apis/autoscaling/v2alpha1/register.go → pkg/apis/autoscaling/v2beta1/register.go
View File

@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package v2alpha1
package v2beta1
import (
autoscalingv2alpha1 "k8s.io/api/autoscaling/v2alpha1"
autoscalingv2beta1 "k8s.io/api/autoscaling/v2beta1"
"k8s.io/apimachinery/pkg/runtime/schema"
)
@ -25,7 +25,7 @@ import (
const GroupName = "autoscaling"
// SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v2alpha1"}
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v2beta1"}
// Resource takes an unqualified resource and returns a Group qualified GroupResource
func Resource(resource string) schema.GroupResource {
@ -33,7 +33,7 @@ func Resource(resource string) schema.GroupResource {
}
var (
localSchemeBuilder = &autoscalingv2alpha1.SchemeBuilder
localSchemeBuilder = &autoscalingv2beta1.SchemeBuilder
AddToScheme = localSchemeBuilder.AddToScheme
)

438
pkg/apis/autoscaling/v2beta1/zz_generated.conversion.go Normal file
View File

@ -0,0 +1,438 @@
// +build !ignore_autogenerated
/*
Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
// This file was autogenerated by conversion-gen. Do not edit it manually!
package v2beta1
import (
v2beta1 "k8s.io/api/autoscaling/v2beta1"
v1 "k8s.io/api/core/v1"
resource "k8s.io/apimachinery/pkg/api/resource"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
api "k8s.io/kubernetes/pkg/api"
autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
unsafe "unsafe"
)
func init() {
localSchemeBuilder.Register(RegisterConversions)
}
// RegisterConversions adds conversion functions to the given scheme.
// Public to allow building arbitrary schemes.
func RegisterConversions(scheme *runtime.Scheme) error {
return scheme.AddGeneratedConversionFuncs(
Convert_v2beta1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference,
Convert_autoscaling_CrossVersionObjectReference_To_v2beta1_CrossVersionObjectReference,
Convert_v2beta1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler,
Convert_autoscaling_HorizontalPodAutoscaler_To_v2beta1_HorizontalPodAutoscaler,
Convert_v2beta1_HorizontalPodAutoscalerCondition_To_autoscaling_HorizontalPodAutoscalerCondition,
Convert_autoscaling_HorizontalPodAutoscalerCondition_To_v2beta1_HorizontalPodAutoscalerCondition,
Convert_v2beta1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscalerList,
Convert_autoscaling_HorizontalPodAutoscalerList_To_v2beta1_HorizontalPodAutoscalerList,
Convert_v2beta1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec,
Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v2beta1_HorizontalPodAutoscalerSpec,
Convert_v2beta1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus,
Convert_autoscaling_HorizontalPodAutoscalerStatus_To_v2beta1_HorizontalPodAutoscalerStatus,
Convert_v2beta1_MetricSpec_To_autoscaling_MetricSpec,
Convert_autoscaling_MetricSpec_To_v2beta1_MetricSpec,
Convert_v2beta1_MetricStatus_To_autoscaling_MetricStatus,
Convert_autoscaling_MetricStatus_To_v2beta1_MetricStatus,
Convert_v2beta1_ObjectMetricSource_To_autoscaling_ObjectMetricSource,
Convert_autoscaling_ObjectMetricSource_To_v2beta1_ObjectMetricSource,
Convert_v2beta1_ObjectMetricStatus_To_autoscaling_ObjectMetricStatus,
Convert_autoscaling_ObjectMetricStatus_To_v2beta1_ObjectMetricStatus,
Convert_v2beta1_PodsMetricSource_To_autoscaling_PodsMetricSource,
Convert_autoscaling_PodsMetricSource_To_v2beta1_PodsMetricSource,
Convert_v2beta1_PodsMetricStatus_To_autoscaling_PodsMetricStatus,
Convert_autoscaling_PodsMetricStatus_To_v2beta1_PodsMetricStatus,
Convert_v2beta1_ResourceMetricSource_To_autoscaling_ResourceMetricSource,
Convert_autoscaling_ResourceMetricSource_To_v2beta1_ResourceMetricSource,
Convert_v2beta1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus,
Convert_autoscaling_ResourceMetricStatus_To_v2beta1_ResourceMetricStatus,
)
}
func autoConvert_v2beta1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(in *v2beta1.CrossVersionObjectReference, out *autoscaling.CrossVersionObjectReference, s conversion.Scope) error {
out.Kind = in.Kind
out.Name = in.Name
out.APIVersion = in.APIVersion
return nil
}
// Convert_v2beta1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference is an autogenerated conversion function.
func Convert_v2beta1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(in *v2beta1.CrossVersionObjectReference, out *autoscaling.CrossVersionObjectReference, s conversion.Scope) error {
return autoConvert_v2beta1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(in, out, s)
}
func autoConvert_autoscaling_CrossVersionObjectReference_To_v2beta1_CrossVersionObjectReference(in *autoscaling.CrossVersionObjectReference, out *v2beta1.CrossVersionObjectReference, s conversion.Scope) error {
out.Kind = in.Kind
out.Name = in.Name
out.APIVersion = in.APIVersion
return nil
}
// Convert_autoscaling_CrossVersionObjectReference_To_v2beta1_CrossVersionObjectReference is an autogenerated conversion function.
func Convert_autoscaling_CrossVersionObjectReference_To_v2beta1_CrossVersionObjectReference(in *autoscaling.CrossVersionObjectReference, out *v2beta1.CrossVersionObjectReference, s conversion.Scope) error {
return autoConvert_autoscaling_CrossVersionObjectReference_To_v2beta1_CrossVersionObjectReference(in, out, s)
}
func autoConvert_v2beta1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler(in *v2beta1.HorizontalPodAutoscaler, out *autoscaling.HorizontalPodAutoscaler, s conversion.Scope) error {
out.ObjectMeta = in.ObjectMeta
if err := Convert_v2beta1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}
if err := Convert_v2beta1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, s); err != nil {
return err
}
return nil
}
// Convert_v2beta1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler is an autogenerated conversion function.
func Convert_v2beta1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler(in *v2beta1.HorizontalPodAutoscaler, out *autoscaling.HorizontalPodAutoscaler, s conversion.Scope) error {
return autoConvert_v2beta1_HorizontalPodAutoscaler_To_autoscaling_HorizontalPodAutoscaler(in, out, s)
}
func autoConvert_autoscaling_HorizontalPodAutoscaler_To_v2beta1_HorizontalPodAutoscaler(in *autoscaling.HorizontalPodAutoscaler, out *v2beta1.HorizontalPodAutoscaler, s conversion.Scope) error {
out.ObjectMeta = in.ObjectMeta
if err := Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v2beta1_HorizontalPodAutoscalerSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}
if err := Convert_autoscaling_HorizontalPodAutoscalerStatus_To_v2beta1_HorizontalPodAutoscalerStatus(&in.Status, &out.Status, s); err != nil {
return err
}
return nil
}
// Convert_autoscaling_HorizontalPodAutoscaler_To_v2beta1_HorizontalPodAutoscaler is an autogenerated conversion function.
func Convert_autoscaling_HorizontalPodAutoscaler_To_v2beta1_HorizontalPodAutoscaler(in *autoscaling.HorizontalPodAutoscaler, out *v2beta1.HorizontalPodAutoscaler, s conversion.Scope) error {
return autoConvert_autoscaling_HorizontalPodAutoscaler_To_v2beta1_HorizontalPodAutoscaler(in, out, s)
}
func autoConvert_v2beta1_HorizontalPodAutoscalerCondition_To_autoscaling_HorizontalPodAutoscalerCondition(in *v2beta1.HorizontalPodAutoscalerCondition, out *autoscaling.HorizontalPodAutoscalerCondition, s conversion.Scope) error {
out.Type = autoscaling.HorizontalPodAutoscalerConditionType(in.Type)
out.Status = autoscaling.ConditionStatus(in.Status)
out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason
out.Message = in.Message
return nil
}
// Convert_v2beta1_HorizontalPodAutoscalerCondition_To_autoscaling_HorizontalPodAutoscalerCondition is an autogenerated conversion function.
func Convert_v2beta1_HorizontalPodAutoscalerCondition_To_autoscaling_HorizontalPodAutoscalerCondition(in *v2beta1.HorizontalPodAutoscalerCondition, out *autoscaling.HorizontalPodAutoscalerCondition, s conversion.Scope) error {
return autoConvert_v2beta1_HorizontalPodAutoscalerCondition_To_autoscaling_HorizontalPodAutoscalerCondition(in, out, s)
}
func autoConvert_autoscaling_HorizontalPodAutoscalerCondition_To_v2beta1_HorizontalPodAutoscalerCondition(in *autoscaling.HorizontalPodAutoscalerCondition, out *v2beta1.HorizontalPodAutoscalerCondition, s conversion.Scope) error {
out.Type = v2beta1.HorizontalPodAutoscalerConditionType(in.Type)
out.Status = v1.ConditionStatus(in.Status)
out.LastTransitionTime = in.LastTransitionTime
out.Reason = in.Reason
out.Message = in.Message
return nil
}
// Convert_autoscaling_HorizontalPodAutoscalerCondition_To_v2beta1_HorizontalPodAutoscalerCondition is an autogenerated conversion function.
func Convert_autoscaling_HorizontalPodAutoscalerCondition_To_v2beta1_HorizontalPodAutoscalerCondition(in *autoscaling.HorizontalPodAutoscalerCondition, out *v2beta1.HorizontalPodAutoscalerCondition, s conversion.Scope) error {
return autoConvert_autoscaling_HorizontalPodAutoscalerCondition_To_v2beta1_HorizontalPodAutoscalerCondition(in, out, s)
}
func autoConvert_v2beta1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscalerList(in *v2beta1.HorizontalPodAutoscalerList, out *autoscaling.HorizontalPodAutoscalerList, s conversion.Scope) error {
out.ListMeta = in.ListMeta
out.Items = *(*[]autoscaling.HorizontalPodAutoscaler)(unsafe.Pointer(&in.Items))
return nil
}
// Convert_v2beta1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscalerList is an autogenerated conversion function.
func Convert_v2beta1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscalerList(in *v2beta1.HorizontalPodAutoscalerList, out *autoscaling.HorizontalPodAutoscalerList, s conversion.Scope) error {
return autoConvert_v2beta1_HorizontalPodAutoscalerList_To_autoscaling_HorizontalPodAutoscalerList(in, out, s)
}
func autoConvert_autoscaling_HorizontalPodAutoscalerList_To_v2beta1_HorizontalPodAutoscalerList(in *autoscaling.HorizontalPodAutoscalerList, out *v2beta1.HorizontalPodAutoscalerList, s conversion.Scope) error {
out.ListMeta = in.ListMeta
out.Items = *(*[]v2beta1.HorizontalPodAutoscaler)(unsafe.Pointer(&in.Items))
return nil
}
// Convert_autoscaling_HorizontalPodAutoscalerList_To_v2beta1_HorizontalPodAutoscalerList is an autogenerated conversion function.
func Convert_autoscaling_HorizontalPodAutoscalerList_To_v2beta1_HorizontalPodAutoscalerList(in *autoscaling.HorizontalPodAutoscalerList, out *v2beta1.HorizontalPodAutoscalerList, s conversion.Scope) error {
return autoConvert_autoscaling_HorizontalPodAutoscalerList_To_v2beta1_HorizontalPodAutoscalerList(in, out, s)
}
func autoConvert_v2beta1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec(in *v2beta1.HorizontalPodAutoscalerSpec, out *autoscaling.HorizontalPodAutoscalerSpec, s conversion.Scope) error {
if err := Convert_v2beta1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(&in.ScaleTargetRef, &out.ScaleTargetRef, s); err != nil {
return err
}
out.MinReplicas = (*int32)(unsafe.Pointer(in.MinReplicas))
out.MaxReplicas = in.MaxReplicas
out.Metrics = *(*[]autoscaling.MetricSpec)(unsafe.Pointer(&in.Metrics))
return nil
}
// Convert_v2beta1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec is an autogenerated conversion function.
func Convert_v2beta1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec(in *v2beta1.HorizontalPodAutoscalerSpec, out *autoscaling.HorizontalPodAutoscalerSpec, s conversion.Scope) error {
return autoConvert_v2beta1_HorizontalPodAutoscalerSpec_To_autoscaling_HorizontalPodAutoscalerSpec(in, out, s)
}
func autoConvert_autoscaling_HorizontalPodAutoscalerSpec_To_v2beta1_HorizontalPodAutoscalerSpec(in *autoscaling.HorizontalPodAutoscalerSpec, out *v2beta1.HorizontalPodAutoscalerSpec, s conversion.Scope) error {
if err := Convert_autoscaling_CrossVersionObjectReference_To_v2beta1_CrossVersionObjectReference(&in.ScaleTargetRef, &out.ScaleTargetRef, s); err != nil {
return err
}
out.MinReplicas = (*int32)(unsafe.Pointer(in.MinReplicas))
out.MaxReplicas = in.MaxReplicas
out.Metrics = *(*[]v2beta1.MetricSpec)(unsafe.Pointer(&in.Metrics))
return nil
}
// Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v2beta1_HorizontalPodAutoscalerSpec is an autogenerated conversion function.
func Convert_autoscaling_HorizontalPodAutoscalerSpec_To_v2beta1_HorizontalPodAutoscalerSpec(in *autoscaling.HorizontalPodAutoscalerSpec, out *v2beta1.HorizontalPodAutoscalerSpec, s conversion.Scope) error {
return autoConvert_autoscaling_HorizontalPodAutoscalerSpec_To_v2beta1_HorizontalPodAutoscalerSpec(in, out, s)
}
func autoConvert_v2beta1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *v2beta1.HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration))
out.LastScaleTime = (*meta_v1.Time)(unsafe.Pointer(in.LastScaleTime))
out.CurrentReplicas = in.CurrentReplicas
out.DesiredReplicas = in.DesiredReplicas
out.CurrentMetrics = *(*[]autoscaling.MetricStatus)(unsafe.Pointer(&in.CurrentMetrics))
out.Conditions = *(*[]autoscaling.HorizontalPodAutoscalerCondition)(unsafe.Pointer(&in.Conditions))
return nil
}
// Convert_v2beta1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus is an autogenerated conversion function.
func Convert_v2beta1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in *v2beta1.HorizontalPodAutoscalerStatus, out *autoscaling.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
return autoConvert_v2beta1_HorizontalPodAutoscalerStatus_To_autoscaling_HorizontalPodAutoscalerStatus(in, out, s)
}
func autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v2beta1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *v2beta1.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
out.ObservedGeneration = (*int64)(unsafe.Pointer(in.ObservedGeneration))
out.LastScaleTime = (*meta_v1.Time)(unsafe.Pointer(in.LastScaleTime))
out.CurrentReplicas = in.CurrentReplicas
out.DesiredReplicas = in.DesiredReplicas
out.CurrentMetrics = *(*[]v2beta1.MetricStatus)(unsafe.Pointer(&in.CurrentMetrics))
out.Conditions = *(*[]v2beta1.HorizontalPodAutoscalerCondition)(unsafe.Pointer(&in.Conditions))
return nil
}
// Convert_autoscaling_HorizontalPodAutoscalerStatus_To_v2beta1_HorizontalPodAutoscalerStatus is an autogenerated conversion function.
func Convert_autoscaling_HorizontalPodAutoscalerStatus_To_v2beta1_HorizontalPodAutoscalerStatus(in *autoscaling.HorizontalPodAutoscalerStatus, out *v2beta1.HorizontalPodAutoscalerStatus, s conversion.Scope) error {
return autoConvert_autoscaling_HorizontalPodAutoscalerStatus_To_v2beta1_HorizontalPodAutoscalerStatus(in, out, s)
}
func autoConvert_v2beta1_MetricSpec_To_autoscaling_MetricSpec(in *v2beta1.MetricSpec, out *autoscaling.MetricSpec, s conversion.Scope) error {
out.Type = autoscaling.MetricSourceType(in.Type)
out.Object = (*autoscaling.ObjectMetricSource)(unsafe.Pointer(in.Object))
out.Pods = (*autoscaling.PodsMetricSource)(unsafe.Pointer(in.Pods))
out.Resource = (*autoscaling.ResourceMetricSource)(unsafe.Pointer(in.Resource))
return nil
}
// Convert_v2beta1_MetricSpec_To_autoscaling_MetricSpec is an autogenerated conversion function.
func Convert_v2beta1_MetricSpec_To_autoscaling_MetricSpec(in *v2beta1.MetricSpec, out *autoscaling.MetricSpec, s conversion.Scope) error {
return autoConvert_v2beta1_MetricSpec_To_autoscaling_MetricSpec(in, out, s)
}
func autoConvert_autoscaling_MetricSpec_To_v2beta1_MetricSpec(in *autoscaling.MetricSpec, out *v2beta1.MetricSpec, s conversion.Scope) error {
out.Type = v2beta1.MetricSourceType(in.Type)
out.Object = (*v2beta1.ObjectMetricSource)(unsafe.Pointer(in.Object))
out.Pods = (*v2beta1.PodsMetricSource)(unsafe.Pointer(in.Pods))
out.Resource = (*v2beta1.ResourceMetricSource)(unsafe.Pointer(in.Resource))
return nil
}
// Convert_autoscaling_MetricSpec_To_v2beta1_MetricSpec is an autogenerated conversion function.
func Convert_autoscaling_MetricSpec_To_v2beta1_MetricSpec(in *autoscaling.MetricSpec, out *v2beta1.MetricSpec, s conversion.Scope) error {
return autoConvert_autoscaling_MetricSpec_To_v2beta1_MetricSpec(in, out, s)
}
func autoConvert_v2beta1_MetricStatus_To_autoscaling_MetricStatus(in *v2beta1.MetricStatus, out *autoscaling.MetricStatus, s conversion.Scope) error {
out.Type = autoscaling.MetricSourceType(in.Type)
out.Object = (*autoscaling.ObjectMetricStatus)(unsafe.Pointer(in.Object))
out.Pods = (*autoscaling.PodsMetricStatus)(unsafe.Pointer(in.Pods))
out.Resource = (*autoscaling.ResourceMetricStatus)(unsafe.Pointer(in.Resource))
return nil
}
// Convert_v2beta1_MetricStatus_To_autoscaling_MetricStatus is an autogenerated conversion function.
func Convert_v2beta1_MetricStatus_To_autoscaling_MetricStatus(in *v2beta1.MetricStatus, out *autoscaling.MetricStatus, s conversion.Scope) error {
return autoConvert_v2beta1_MetricStatus_To_autoscaling_MetricStatus(in, out, s)
}
func autoConvert_autoscaling_MetricStatus_To_v2beta1_MetricStatus(in *autoscaling.MetricStatus, out *v2beta1.MetricStatus, s conversion.Scope) error {
out.Type = v2beta1.MetricSourceType(in.Type)
out.Object = (*v2beta1.ObjectMetricStatus)(unsafe.Pointer(in.Object))
out.Pods = (*v2beta1.PodsMetricStatus)(unsafe.Pointer(in.Pods))
out.Resource = (*v2beta1.ResourceMetricStatus)(unsafe.Pointer(in.Resource))
return nil
}
// Convert_autoscaling_MetricStatus_To_v2beta1_MetricStatus is an autogenerated conversion function.
func Convert_autoscaling_MetricStatus_To_v2beta1_MetricStatus(in *autoscaling.MetricStatus, out *v2beta1.MetricStatus, s conversion.Scope) error {
return autoConvert_autoscaling_MetricStatus_To_v2beta1_MetricStatus(in, out, s)
}
func autoConvert_v2beta1_ObjectMetricSource_To_autoscaling_ObjectMetricSource(in *v2beta1.ObjectMetricSource, out *autoscaling.ObjectMetricSource, s conversion.Scope) error {
if err := Convert_v2beta1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(&in.Target, &out.Target, s); err != nil {
return err
}
out.MetricName = in.MetricName
out.TargetValue = in.TargetValue
return nil
}
// Convert_v2beta1_ObjectMetricSource_To_autoscaling_ObjectMetricSource is an autogenerated conversion function.
func Convert_v2beta1_ObjectMetricSource_To_autoscaling_ObjectMetricSource(in *v2beta1.ObjectMetricSource, out *autoscaling.ObjectMetricSource, s conversion.Scope) error {
return autoConvert_v2beta1_ObjectMetricSource_To_autoscaling_ObjectMetricSource(in, out, s)
}
func autoConvert_autoscaling_ObjectMetricSource_To_v2beta1_ObjectMetricSource(in *autoscaling.ObjectMetricSource, out *v2beta1.ObjectMetricSource, s conversion.Scope) error {
if err := Convert_autoscaling_CrossVersionObjectReference_To_v2beta1_CrossVersionObjectReference(&in.Target, &out.Target, s); err != nil {
return err
}
out.MetricName = in.MetricName
out.TargetValue = in.TargetValue
return nil
}
// Convert_autoscaling_ObjectMetricSource_To_v2beta1_ObjectMetricSource is an autogenerated conversion function.
func Convert_autoscaling_ObjectMetricSource_To_v2beta1_ObjectMetricSource(in *autoscaling.ObjectMetricSource, out *v2beta1.ObjectMetricSource, s conversion.Scope) error {
return autoConvert_autoscaling_ObjectMetricSource_To_v2beta1_ObjectMetricSource(in, out, s)
}
func autoConvert_v2beta1_ObjectMetricStatus_To_autoscaling_ObjectMetricStatus(in *v2beta1.ObjectMetricStatus, out *autoscaling.ObjectMetricStatus, s conversion.Scope) error {
if err := Convert_v2beta1_CrossVersionObjectReference_To_autoscaling_CrossVersionObjectReference(&in.Target, &out.Target, s); err != nil {
return err
}
out.MetricName = in.MetricName
out.CurrentValue = in.CurrentValue
return nil
}
// Convert_v2beta1_ObjectMetricStatus_To_autoscaling_ObjectMetricStatus is an autogenerated conversion function.
func Convert_v2beta1_ObjectMetricStatus_To_autoscaling_ObjectMetricStatus(in *v2beta1.ObjectMetricStatus, out *autoscaling.ObjectMetricStatus, s conversion.Scope) error {
return autoConvert_v2beta1_ObjectMetricStatus_To_autoscaling_ObjectMetricStatus(in, out, s)
}
func autoConvert_autoscaling_ObjectMetricStatus_To_v2beta1_ObjectMetricStatus(in *autoscaling.ObjectMetricStatus, out *v2beta1.ObjectMetricStatus, s conversion.Scope) error {
if err := Convert_autoscaling_CrossVersionObjectReference_To_v2beta1_CrossVersionObjectReference(&in.Target, &out.Target, s); err != nil {
return err
}
out.MetricName = in.MetricName
out.CurrentValue = in.CurrentValue
return nil
}
// Convert_autoscaling_ObjectMetricStatus_To_v2beta1_ObjectMetricStatus is an autogenerated conversion function.
func Convert_autoscaling_ObjectMetricStatus_To_v2beta1_ObjectMetricStatus(in *autoscaling.ObjectMetricStatus, out *v2beta1.ObjectMetricStatus, s conversion.Scope) error {
return autoConvert_autoscaling_ObjectMetricStatus_To_v2beta1_ObjectMetricStatus(in, out, s)
}
func autoConvert_v2beta1_PodsMetricSource_To_autoscaling_PodsMetricSource(in *v2beta1.PodsMetricSource, out *autoscaling.PodsMetricSource, s conversion.Scope) error {
out.MetricName = in.MetricName
out.TargetAverageValue = in.TargetAverageValue
return nil
}
// Convert_v2beta1_PodsMetricSource_To_autoscaling_PodsMetricSource is an autogenerated conversion function.
func Convert_v2beta1_PodsMetricSource_To_autoscaling_PodsMetricSource(in *v2beta1.PodsMetricSource, out *autoscaling.PodsMetricSource, s conversion.Scope) error {
return autoConvert_v2beta1_PodsMetricSource_To_autoscaling_PodsMetricSource(in, out, s)
}
func autoConvert_autoscaling_PodsMetricSource_To_v2beta1_PodsMetricSource(in *autoscaling.PodsMetricSource, out *v2beta1.PodsMetricSource, s conversion.Scope) error {
out.MetricName = in.MetricName
out.TargetAverageValue = in.TargetAverageValue
return nil
}
// Convert_autoscaling_PodsMetricSource_To_v2beta1_PodsMetricSource is an autogenerated conversion function.
func Convert_autoscaling_PodsMetricSource_To_v2beta1_PodsMetricSource(in *autoscaling.PodsMetricSource, out *v2beta1.PodsMetricSource, s conversion.Scope) error {
return autoConvert_autoscaling_PodsMetricSource_To_v2beta1_PodsMetricSource(in, out, s)
}
func autoConvert_v2beta1_PodsMetricStatus_To_autoscaling_PodsMetricStatus(in *v2beta1.PodsMetricStatus, out *autoscaling.PodsMetricStatus, s conversion.Scope) error {
out.MetricName = in.MetricName
out.CurrentAverageValue = in.CurrentAverageValue
return nil
}
// Convert_v2beta1_PodsMetricStatus_To_autoscaling_PodsMetricStatus is an autogenerated conversion function.
func Convert_v2beta1_PodsMetricStatus_To_autoscaling_PodsMetricStatus(in *v2beta1.PodsMetricStatus, out *autoscaling.PodsMetricStatus, s conversion.Scope) error {
return autoConvert_v2beta1_PodsMetricStatus_To_autoscaling_PodsMetricStatus(in, out, s)
}
func autoConvert_autoscaling_PodsMetricStatus_To_v2beta1_PodsMetricStatus(in *autoscaling.PodsMetricStatus, out *v2beta1.PodsMetricStatus, s conversion.Scope) error {
out.MetricName = in.MetricName
out.CurrentAverageValue = in.CurrentAverageValue
return nil
}
// Convert_autoscaling_PodsMetricStatus_To_v2beta1_PodsMetricStatus is an autogenerated conversion function.
func Convert_autoscaling_PodsMetricStatus_To_v2beta1_PodsMetricStatus(in *autoscaling.PodsMetricStatus, out *v2beta1.PodsMetricStatus, s conversion.Scope) error {
return autoConvert_autoscaling_PodsMetricStatus_To_v2beta1_PodsMetricStatus(in, out, s)
}
func autoConvert_v2beta1_ResourceMetricSource_To_autoscaling_ResourceMetricSource(in *v2beta1.ResourceMetricSource, out *autoscaling.ResourceMetricSource, s conversion.Scope) error {
out.Name = api.ResourceName(in.Name)
out.TargetAverageUtilization = (*int32)(unsafe.Pointer(in.TargetAverageUtilization))
out.TargetAverageValue = (*resource.Quantity)(unsafe.Pointer(in.TargetAverageValue))
return nil
}
// Convert_v2beta1_ResourceMetricSource_To_autoscaling_ResourceMetricSource is an autogenerated conversion function.
func Convert_v2beta1_ResourceMetricSource_To_autoscaling_ResourceMetricSource(in *v2beta1.ResourceMetricSource, out *autoscaling.ResourceMetricSource, s conversion.Scope) error {
return autoConvert_v2beta1_ResourceMetricSource_To_autoscaling_ResourceMetricSource(in, out, s)
}
func autoConvert_autoscaling_ResourceMetricSource_To_v2beta1_ResourceMetricSource(in *autoscaling.ResourceMetricSource, out *v2beta1.ResourceMetricSource, s conversion.Scope) error {
out.Name = v1.ResourceName(in.Name)
out.TargetAverageUtilization = (*int32)(unsafe.Pointer(in.TargetAverageUtilization))
out.TargetAverageValue = (*resource.Quantity)(unsafe.Pointer(in.TargetAverageValue))
return nil
}
// Convert_autoscaling_ResourceMetricSource_To_v2beta1_ResourceMetricSource is an autogenerated conversion function.
func Convert_autoscaling_ResourceMetricSource_To_v2beta1_ResourceMetricSource(in *autoscaling.ResourceMetricSource, out *v2beta1.ResourceMetricSource, s conversion.Scope) error {
return autoConvert_autoscaling_ResourceMetricSource_To_v2beta1_ResourceMetricSource(in, out, s)
}
func autoConvert_v2beta1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus(in *v2beta1.ResourceMetricStatus, out *autoscaling.ResourceMetricStatus, s conversion.Scope) error {
out.Name = api.ResourceName(in.Name)
out.CurrentAverageUtilization = (*int32)(unsafe.Pointer(in.CurrentAverageUtilization))
out.CurrentAverageValue = in.CurrentAverageValue
return nil
}
// Convert_v2beta1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus is an autogenerated conversion function.
func Convert_v2beta1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus(in *v2beta1.ResourceMetricStatus, out *autoscaling.ResourceMetricStatus, s conversion.Scope) error {
return autoConvert_v2beta1_ResourceMetricStatus_To_autoscaling_ResourceMetricStatus(in, out, s)
}
func autoConvert_autoscaling_ResourceMetricStatus_To_v2beta1_ResourceMetricStatus(in *autoscaling.ResourceMetricStatus, out *v2beta1.ResourceMetricStatus, s conversion.Scope) error {
out.Name = v1.ResourceName(in.Name)
out.CurrentAverageUtilization = (*int32)(unsafe.Pointer(in.CurrentAverageUtilization))
out.CurrentAverageValue = in.CurrentAverageValue
return nil
}
// Convert_autoscaling_ResourceMetricStatus_To_v2beta1_ResourceMetricStatus is an autogenerated conversion function.
func Convert_autoscaling_ResourceMetricStatus_To_v2beta1_ResourceMetricStatus(in *autoscaling.ResourceMetricStatus, out *v2beta1.ResourceMetricStatus, s conversion.Scope) error {
return autoConvert_autoscaling_ResourceMetricStatus_To_v2beta1_ResourceMetricStatus(in, out, s)
}

16
pkg/apis/autoscaling/v2alpha1/zz_generated.defaults.go → pkg/apis/autoscaling/v2beta1/zz_generated.defaults.go
View File

@ -18,10 +18,10 @@ limitations under the License.
// This file was autogenerated by defaulter-gen. Do not edit it manually!
package v2alpha1
package v2beta1
import (
v2alpha1 "k8s.io/api/autoscaling/v2alpha1"
v2beta1 "k8s.io/api/autoscaling/v2beta1"
runtime "k8s.io/apimachinery/pkg/runtime"
)
@ -29,20 +29,20 @@ import (
// Public to allow building arbitrary schemes.
// All generated defaulters are covering - they call all nested defaulters.
func RegisterDefaults(scheme *runtime.Scheme) error {
scheme.AddTypeDefaultingFunc(&v2alpha1.HorizontalPodAutoscaler{}, func(obj interface{}) {
SetObjectDefaults_HorizontalPodAutoscaler(obj.(*v2alpha1.HorizontalPodAutoscaler))
scheme.AddTypeDefaultingFunc(&v2beta1.HorizontalPodAutoscaler{}, func(obj interface{}) {
SetObjectDefaults_HorizontalPodAutoscaler(obj.(*v2beta1.HorizontalPodAutoscaler))
})
scheme.AddTypeDefaultingFunc(&v2alpha1.HorizontalPodAutoscalerList{}, func(obj interface{}) {
SetObjectDefaults_HorizontalPodAutoscalerList(obj.(*v2alpha1.HorizontalPodAutoscalerList))
scheme.AddTypeDefaultingFunc(&v2beta1.HorizontalPodAutoscalerList{}, func(obj interface{}) {
SetObjectDefaults_HorizontalPodAutoscalerList(obj.(*v2beta1.HorizontalPodAutoscalerList))
})
return nil
}
func SetObjectDefaults_HorizontalPodAutoscaler(in *v2alpha1.HorizontalPodAutoscaler) {
func SetObjectDefaults_HorizontalPodAutoscaler(in *v2beta1.HorizontalPodAutoscaler) {
SetDefaults_HorizontalPodAutoscaler(in)
}
func SetObjectDefaults_HorizontalPodAutoscalerList(in *v2alpha1.HorizontalPodAutoscalerList) {
func SetObjectDefaults_HorizontalPodAutoscalerList(in *v2beta1.HorizontalPodAutoscalerList) {
for i := range in.Items {
a := &in.Items[i]
SetObjectDefaults_HorizontalPodAutoscaler(a)

4
pkg/controller/podautoscaler/BUILD
View File

@ -21,7 +21,7 @@ go_library(
"//pkg/controller/podautoscaler/metrics:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",
@ -65,7 +65,7 @@ go_test(
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/github.com/stretchr/testify/require:go_default_library",
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",

2
pkg/controller/podautoscaler/horizontal.go
View File

@ -23,7 +23,7 @@ import (
"github.com/golang/glog"
autoscalingv1 "k8s.io/api/autoscaling/v1"
autoscalingv2 "k8s.io/api/autoscaling/v2alpha1"
autoscalingv2 "k8s.io/api/autoscaling/v2beta1"
"k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
apiequality "k8s.io/apimachinery/pkg/api/equality"

2
pkg/controller/podautoscaler/horizontal_test.go
View File

@ -25,7 +25,7 @@ import (
"time"
autoscalingv1 "k8s.io/api/autoscaling/v1"
autoscalingv2 "k8s.io/api/autoscaling/v2alpha1"
autoscalingv2 "k8s.io/api/autoscaling/v2beta1"
"k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/api/resource"

2
pkg/controller/podautoscaler/legacy_horizontal_test.go
View File

@ -28,7 +28,7 @@ import (
"time"
autoscalingv1 "k8s.io/api/autoscaling/v1"
autoscalingv2 "k8s.io/api/autoscaling/v2alpha1"
autoscalingv2 "k8s.io/api/autoscaling/v2beta1"
"k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/api/resource"

4
pkg/controller/podautoscaler/metrics/BUILD
View File

@ -16,7 +16,7 @@ go_library(
],
deps = [
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
@ -42,7 +42,7 @@ go_test(
"//pkg/api:go_default_library",
"//pkg/apis/extensions/install:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

2
pkg/controller/podautoscaler/metrics/interfaces.go
View File

@ -19,7 +19,7 @@ package metrics
import (
"time"
autoscaling "k8s.io/api/autoscaling/v2alpha1"
autoscaling "k8s.io/api/autoscaling/v2beta1"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels"
)

2
pkg/controller/podautoscaler/metrics/legacy_metrics_client.go
View File

@ -26,7 +26,7 @@ import (
heapster "k8s.io/heapster/metrics/api/v1/types"
metricsapi "k8s.io/metrics/pkg/apis/metrics/v1alpha1"
autoscaling "k8s.io/api/autoscaling/v2alpha1"
autoscaling "k8s.io/api/autoscaling/v2beta1"
"k8s.io/api/core/v1"
clientgov1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/controller/podautoscaler/metrics/rest_metrics_client.go
View File

@ -22,7 +22,7 @@ import (
"github.com/golang/glog"
autoscaling "k8s.io/api/autoscaling/v2alpha1"
autoscaling "k8s.io/api/autoscaling/v2beta1"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"

2
pkg/controller/podautoscaler/metrics/rest_metrics_client_test.go
View File

@ -21,7 +21,7 @@ import (
"testing"
"time"
autoscalingapi "k8s.io/api/autoscaling/v2alpha1"
autoscalingapi "k8s.io/api/autoscaling/v2beta1"
"k8s.io/api/core/v1"
kv1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"

2
pkg/controller/podautoscaler/replica_calculator.go
View File

@ -21,7 +21,7 @@ import (
"math"
"time"
autoscaling "k8s.io/api/autoscaling/v2alpha1"
autoscaling "k8s.io/api/autoscaling/v2beta1"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"

2
pkg/controller/podautoscaler/replica_calculator_test.go
View File

@ -22,7 +22,7 @@ import (
"testing"
"time"
autoscalingv2 "k8s.io/api/autoscaling/v2alpha1"
autoscalingv2 "k8s.io/api/autoscaling/v2beta1"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

2
pkg/generated/openapi/BUILD
View File

@ -27,7 +27,7 @@ openapi_library(
"k8s.io/api/authorization/v1",
"k8s.io/api/authorization/v1beta1",
"k8s.io/api/autoscaling/v1",
"k8s.io/api/autoscaling/v2alpha1",
"k8s.io/api/autoscaling/v2beta1",
"k8s.io/api/batch/v1",
"k8s.io/api/batch/v1beta1",
"k8s.io/api/batch/v2alpha1",

2
pkg/kubectl/cmd/testing/fake.go
View File

@ -598,7 +598,7 @@ func (f *fakeAPIFactory) KubernetesClientSet() (*kubernetes.Clientset, error) {
clientset.AuthorizationV1().RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.AuthorizationV1beta1().RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.AutoscalingV1().RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.AutoscalingV2alpha1().RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.AutoscalingV2beta1().RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.BatchV1().RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.BatchV2alpha1().RESTClient().(*restclient.RESTClient).Client = fakeClient.Client
clientset.CertificatesV1beta1().RESTClient().(*restclient.RESTClient).Client = fakeClient.Client

2
pkg/printers/internalversion/BUILD
View File

@ -86,7 +86,7 @@ go_library(
"//vendor/github.com/fatih/camelcase:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/api/apps/v1beta1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/api/batch/v1:go_default_library",
"//vendor/k8s.io/api/batch/v1beta1:go_default_library",
"//vendor/k8s.io/api/certificates/v1beta1:go_default_library",

12
pkg/printers/internalversion/printers.go
View File

@ -27,7 +27,7 @@ import (
"time"
appsv1beta1 "k8s.io/api/apps/v1beta1"
autoscalingv2alpha1 "k8s.io/api/autoscaling/v2alpha1"
autoscalingv2beta1 "k8s.io/api/autoscaling/v2beta1"
batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
certificatesv1beta1 "k8s.io/api/certificates/v1beta1"
@ -329,11 +329,11 @@ func AddHandlers(h printers.PrintHandler) {
horizontalPodAutoscalerColumnDefinitions := []metav1alpha1.TableColumnDefinition{
{Name: "Name", Type: "string", Format: "name", Description: metav1.ObjectMeta{}.SwaggerDoc()["name"]},
{Name: "Reference", Type: "string", Description: autoscalingv2alpha1.HorizontalPodAutoscalerSpec{}.SwaggerDoc()["scaleTargetRef"]},
{Name: "Targets", Type: "string", Description: autoscalingv2alpha1.HorizontalPodAutoscalerSpec{}.SwaggerDoc()["metrics"]},
{Name: "MinPods", Type: "string", Description: autoscalingv2alpha1.HorizontalPodAutoscalerSpec{}.SwaggerDoc()["minReplicas"]},
{Name: "MaxPods", Type: "string", Description: autoscalingv2alpha1.HorizontalPodAutoscalerSpec{}.SwaggerDoc()["maxReplicas"]},
{Name: "Replicas", Type: "string", Description: autoscalingv2alpha1.HorizontalPodAutoscalerStatus{}.SwaggerDoc()["currentReplicas"]},
{Name: "Reference", Type: "string", Description: autoscalingv2beta1.HorizontalPodAutoscalerSpec{}.SwaggerDoc()["scaleTargetRef"]},
{Name: "Targets", Type: "string", Description: autoscalingv2beta1.HorizontalPodAutoscalerSpec{}.SwaggerDoc()["metrics"]},
{Name: "MinPods", Type: "string", Description: autoscalingv2beta1.HorizontalPodAutoscalerSpec{}.SwaggerDoc()["minReplicas"]},
{Name: "MaxPods", Type: "string", Description: autoscalingv2beta1.HorizontalPodAutoscalerSpec{}.SwaggerDoc()["maxReplicas"]},
{Name: "Replicas", Type: "string", Description: autoscalingv2beta1.HorizontalPodAutoscalerStatus{}.SwaggerDoc()["currentReplicas"]},
{Name: "Age", Type: "string", Description: metav1.ObjectMeta{}.SwaggerDoc()["creationTimestamp"]},
}
h.TableHandler(horizontalPodAutoscalerColumnDefinitions, printHorizontalPodAutoscaler)

2
pkg/registry/autoscaling/rest/BUILD
View File

@ -13,7 +13,7 @@ go_library(
"//pkg/apis/autoscaling:go_default_library",
"//pkg/registry/autoscaling/horizontalpodautoscaler/storage:go_default_library",
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/generic:go_default_library",
"//vendor/k8s.io/apiserver/pkg/registry/rest:go_default_library",
"//vendor/k8s.io/apiserver/pkg/server:go_default_library",

12
pkg/registry/autoscaling/rest/storage_autoscaling.go
View File

@ -18,7 +18,7 @@ package rest
import (
autoscalingapiv1 "k8s.io/api/autoscaling/v1"
autoscalingapiv2alpha1 "k8s.io/api/autoscaling/v2alpha1"
autoscalingapiv2beta1 "k8s.io/api/autoscaling/v2beta1"
"k8s.io/apiserver/pkg/registry/generic"
"k8s.io/apiserver/pkg/registry/rest"
genericapiserver "k8s.io/apiserver/pkg/server"
@ -35,9 +35,9 @@ func (p RESTStorageProvider) NewRESTStorage(apiResourceConfigSource serverstorag
// If you add a version here, be sure to add an entry in `k8s.io/kubernetes/cmd/kube-apiserver/app/aggregator.go with specific priorities.
// TODO refactor the plumbing to provide the information in the APIGroupInfo
if apiResourceConfigSource.AnyResourcesForVersionEnabled(autoscalingapiv2alpha1.SchemeGroupVersion) {
apiGroupInfo.VersionedResourcesStorageMap[autoscalingapiv2alpha1.SchemeGroupVersion.Version] = p.v2alpha1Storage(apiResourceConfigSource, restOptionsGetter)
apiGroupInfo.GroupMeta.GroupVersion = autoscalingapiv2alpha1.SchemeGroupVersion
if apiResourceConfigSource.AnyResourcesForVersionEnabled(autoscalingapiv2beta1.SchemeGroupVersion) {
apiGroupInfo.VersionedResourcesStorageMap[autoscalingapiv2beta1.SchemeGroupVersion.Version] = p.v2beta1Storage(apiResourceConfigSource, restOptionsGetter)
apiGroupInfo.GroupMeta.GroupVersion = autoscalingapiv2beta1.SchemeGroupVersion
}
if apiResourceConfigSource.AnyResourcesForVersionEnabled(autoscalingapiv1.SchemeGroupVersion) {
apiGroupInfo.VersionedResourcesStorageMap[autoscalingapiv1.SchemeGroupVersion.Version] = p.v1Storage(apiResourceConfigSource, restOptionsGetter)
@ -59,8 +59,8 @@ func (p RESTStorageProvider) v1Storage(apiResourceConfigSource serverstorage.API
return storage
}
func (p RESTStorageProvider) v2alpha1Storage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) map[string]rest.Storage {
version := autoscalingapiv2alpha1.SchemeGroupVersion
func (p RESTStorageProvider) v2beta1Storage(apiResourceConfigSource serverstorage.APIResourceConfigSource, restOptionsGetter generic.RESTOptionsGetter) map[string]rest.Storage {
version := autoscalingapiv2beta1.SchemeGroupVersion
storage := map[string]rest.Storage{}
if apiResourceConfigSource.ResourceEnabled(version.WithResource("horizontalpodautoscalers")) {

4
staging/BUILD
View File

@ -37,7 +37,7 @@ filegroup(
"//staging/src/k8s.io/api/authorization/v1:all-srcs",
"//staging/src/k8s.io/api/authorization/v1beta1:all-srcs",
"//staging/src/k8s.io/api/autoscaling/v1:all-srcs",
"//staging/src/k8s.io/api/autoscaling/v2alpha1:all-srcs",
"//staging/src/k8s.io/api/autoscaling/v2beta1:all-srcs",
"//staging/src/k8s.io/api/batch/v1:all-srcs",
"//staging/src/k8s.io/api/batch/v1beta1:all-srcs",
"//staging/src/k8s.io/api/batch/v2alpha1:all-srcs",
@ -155,7 +155,7 @@ filegroup(
"//staging/src/k8s.io/client-go/listers/authorization/v1:all-srcs",
"//staging/src/k8s.io/client-go/listers/authorization/v1beta1:all-srcs",
"//staging/src/k8s.io/client-go/listers/autoscaling/v1:all-srcs",
"//staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1:all-srcs",
"//staging/src/k8s.io/client-go/listers/autoscaling/v2beta1:all-srcs",
"//staging/src/k8s.io/client-go/listers/batch/v1:all-srcs",
"//staging/src/k8s.io/client-go/listers/batch/v1beta1:all-srcs",
"//staging/src/k8s.io/client-go/listers/batch/v2alpha1:all-srcs",

0
staging/src/k8s.io/api/autoscaling/v2alpha1/BUILD → staging/src/k8s.io/api/autoscaling/v2beta1/BUILD
View File

2
staging/src/k8s.io/api/autoscaling/v2alpha1/doc.go → staging/src/k8s.io/api/autoscaling/v2beta1/doc.go
View File

@ -17,4 +17,4 @@ limitations under the License.
// +k8s:deepcopy-gen=package,register
// +k8s:openapi-gen=true
package v2alpha1 // import "k8s.io/api/autoscaling/v2alpha1"
package v2beta1 // import "k8s.io/api/autoscaling/v2beta1"

206
staging/src/k8s.io/api/autoscaling/v2alpha1/generated.pb.go → staging/src/k8s.io/api/autoscaling/v2beta1/generated.pb.go
View File

@ -15,14 +15,14 @@ limitations under the License.
*/
// Code generated by protoc-gen-gogo.
// source: k8s.io/kubernetes/vendor/k8s.io/api/autoscaling/v2alpha1/generated.proto
// source: k8s.io/kubernetes/vendor/k8s.io/api/autoscaling/v2beta1/generated.proto
// DO NOT EDIT!
/*
Package v2alpha1 is a generated protocol buffer package.
Package v2beta1 is a generated protocol buffer package.
It is generated from these files:
k8s.io/kubernetes/vendor/k8s.io/api/autoscaling/v2alpha1/generated.proto
k8s.io/kubernetes/vendor/k8s.io/api/autoscaling/v2beta1/generated.proto
It has these top-level messages:
CrossVersionObjectReference
@ -40,7 +40,7 @@ limitations under the License.
ResourceMetricSource
ResourceMetricStatus
*/
package v2alpha1
package v2beta1
import proto "github.com/gogo/protobuf/proto"
import fmt "fmt"
@ -134,20 +134,20 @@ func (*ResourceMetricStatus) ProtoMessage() {}
func (*ResourceMetricStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{13} }
func init() {
proto.RegisterType((*CrossVersionObjectReference)(nil), "k8s.io.api.autoscaling.v2alpha1.CrossVersionObjectReference")
proto.RegisterType((*HorizontalPodAutoscaler)(nil), "k8s.io.api.autoscaling.v2alpha1.HorizontalPodAutoscaler")
proto.RegisterType((*HorizontalPodAutoscalerCondition)(nil), "k8s.io.api.autoscaling.v2alpha1.HorizontalPodAutoscalerCondition")
proto.RegisterType((*HorizontalPodAutoscalerList)(nil), "k8s.io.api.autoscaling.v2alpha1.HorizontalPodAutoscalerList")
proto.RegisterType((*HorizontalPodAutoscalerSpec)(nil), "k8s.io.api.autoscaling.v2alpha1.HorizontalPodAutoscalerSpec")
proto.RegisterType((*HorizontalPodAutoscalerStatus)(nil), "k8s.io.api.autoscaling.v2alpha1.HorizontalPodAutoscalerStatus")
proto.RegisterType((*MetricSpec)(nil), "k8s.io.api.autoscaling.v2alpha1.MetricSpec")
proto.RegisterType((*MetricStatus)(nil), "k8s.io.api.autoscaling.v2alpha1.MetricStatus")
proto.RegisterType((*ObjectMetricSource)(nil), "k8s.io.api.autoscaling.v2alpha1.ObjectMetricSource")
proto.RegisterType((*ObjectMetricStatus)(nil), "k8s.io.api.autoscaling.v2alpha1.ObjectMetricStatus")
proto.RegisterType((*PodsMetricSource)(nil), "k8s.io.api.autoscaling.v2alpha1.PodsMetricSource")
proto.RegisterType((*PodsMetricStatus)(nil), "k8s.io.api.autoscaling.v2alpha1.PodsMetricStatus")
proto.RegisterType((*ResourceMetricSource)(nil), "k8s.io.api.autoscaling.v2alpha1.ResourceMetricSource")
proto.RegisterType((*ResourceMetricStatus)(nil), "k8s.io.api.autoscaling.v2alpha1.ResourceMetricStatus")
proto.RegisterType((*CrossVersionObjectReference)(nil), "k8s.io.api.autoscaling.v2beta1.CrossVersionObjectReference")
proto.RegisterType((*HorizontalPodAutoscaler)(nil), "k8s.io.api.autoscaling.v2beta1.HorizontalPodAutoscaler")
proto.RegisterType((*HorizontalPodAutoscalerCondition)(nil), "k8s.io.api.autoscaling.v2beta1.HorizontalPodAutoscalerCondition")
proto.RegisterType((*HorizontalPodAutoscalerList)(nil), "k8s.io.api.autoscaling.v2beta1.HorizontalPodAutoscalerList")
proto.RegisterType((*HorizontalPodAutoscalerSpec)(nil), "k8s.io.api.autoscaling.v2beta1.HorizontalPodAutoscalerSpec")
proto.RegisterType((*HorizontalPodAutoscalerStatus)(nil), "k8s.io.api.autoscaling.v2beta1.HorizontalPodAutoscalerStatus")
proto.RegisterType((*MetricSpec)(nil), "k8s.io.api.autoscaling.v2beta1.MetricSpec")
proto.RegisterType((*MetricStatus)(nil), "k8s.io.api.autoscaling.v2beta1.MetricStatus")
proto.RegisterType((*ObjectMetricSource)(nil), "k8s.io.api.autoscaling.v2beta1.ObjectMetricSource")
proto.RegisterType((*ObjectMetricStatus)(nil), "k8s.io.api.autoscaling.v2beta1.ObjectMetricStatus")
proto.RegisterType((*PodsMetricSource)(nil), "k8s.io.api.autoscaling.v2beta1.PodsMetricSource")
proto.RegisterType((*PodsMetricStatus)(nil), "k8s.io.api.autoscaling.v2beta1.PodsMetricStatus")
proto.RegisterType((*ResourceMetricSource)(nil), "k8s.io.api.autoscaling.v2beta1.ResourceMetricSource")
proto.RegisterType((*ResourceMetricStatus)(nil), "k8s.io.api.autoscaling.v2beta1.ResourceMetricStatus")
}
func (m *CrossVersionObjectReference) Marshal() (dAtA []byte, err error) {
size := m.Size()
@ -3310,92 +3310,92 @@ var (
)
func init() {
proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/api/autoscaling/v2alpha1/generated.proto", fileDescriptorGenerated)
proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/api/autoscaling/v2beta1/generated.proto", fileDescriptorGenerated)
}
var fileDescriptorGenerated = []byte{
// 1317 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xcb, 0x6f, 0x5b, 0xc5,
0x17, 0x8e, 0x1d, 0x27, 0xcd, 0x6f, 0x9c, 0x26, 0xfd, 0x4d, 0xab, 0xd6, 0x4d, 0xa9, 0x1d, 0x5d,
0x21, 0x54, 0x40, 0xbd, 0x97, 0xb8, 0x2d, 0xea, 0x02, 0x21, 0xc5, 0x46, 0xd0, 0x8a, 0xa4, 0x2d,
0xd3, 0x50, 0x10, 0xef, 0xc9, 0xbd, 0x53, 0x67, 0x88, 0xef, 0x43, 0x33, 0x63, 0x8b, 0x54, 0x20,
0xb1, 0x61, 0xcf, 0xa6, 0x12, 0xff, 0x04, 0x6b, 0x58, 0x83, 0x90, 0xba, 0x41, 0x74, 0x59, 0x21,
0x61, 0x51, 0xf3, 0x5f, 0x74, 0x85, 0xe6, 0x71, 0x5f, 0xb6, 0x6f, 0x9d, 0x84, 0xf0, 0xd8, 0xd9,
0x73, 0xce, 0xf9, 0xce, 0x39, 0xdf, 0x7c, 0x73, 0x66, 0x2e, 0xb8, 0xb6, 0x7b, 0x95, 0xdb, 0x34,
0x74, 0x76, 0x7b, 0xdb, 0x84, 0x05, 0x44, 0x10, 0xee, 0xf4, 0x49, 0xe0, 0x85, 0xcc, 0x31, 0x06,
0x1c, 0x51, 0x07, 0xf7, 0x44, 0xc8, 0x5d, 0xdc, 0xa5, 0x41, 0xc7, 0xe9, 0x37, 0x71, 0x37, 0xda,
0xc1, 0x6b, 0x4e, 0x87, 0x04, 0x84, 0x61, 0x41, 0x3c, 0x3b, 0x62, 0xa1, 0x08, 0x61, 0x43, 0x07,
0xd8, 0x38, 0xa2, 0x76, 0x26, 0xc0, 0x8e, 0x03, 0x56, 0x2e, 0x76, 0xa8, 0xd8, 0xe9, 0x6d, 0xdb,
0x6e, 0xe8, 0x3b, 0x9d, 0xb0, 0x13, 0x3a, 0x2a, 0x6e, 0xbb, 0x77, 0x57, 0xfd, 0x53, 0x7f, 0xd4,
0x2f, 0x8d, 0xb7, 0x62, 0x65, 0x0a, 0x70, 0x43, 0x46, 0x9c, 0xfe, 0x58, 0xce, 0x95, 0xcb, 0xa9,
0x8f, 0x8f, 0xdd, 0x1d, 0x1a, 0x10, 0xb6, 0xe7, 0x44, 0xbb, 0x1d, 0x15, 0xc4, 0x08, 0x0f, 0x7b,
0xcc, 0x25, 0x07, 0x8a, 0xe2, 0x8e, 0x4f, 0x04, 0x9e, 0x94, 0xcb, 0x29, 0x8a, 0x62, 0xbd, 0x40,
0x50, 0x7f, 0x3c, 0xcd, 0xcb, 0xd3, 0x02, 0xb8, 0xbb, 0x43, 0x7c, 0x3c, 0x16, 0x77, 0xa9, 0x28,
0xae, 0x27, 0x68, 0xd7, 0xa1, 0x81, 0xe0, 0x82, 0x8d, 0x06, 0x59, 0xf7, 0x4b, 0xe0, 0x5c, 0x9b,
0x85, 0x9c, 0xdf, 0x21, 0x8c, 0xd3, 0x30, 0xb8, 0xb9, 0xfd, 0x29, 0x71, 0x05, 0x22, 0x77, 0x09,
0x23, 0x81, 0x4b, 0xe0, 0x2a, 0xa8, 0xec, 0xd2, 0xc0, 0xab, 0x95, 0x56, 0x4b, 0x17, 0xfe, 0xd7,
0x5a, 0x7c, 0x30, 0x68, 0xcc, 0x0c, 0x07, 0x8d, 0xca, 0x9b, 0x34, 0xf0, 0x90, 0xb2, 0x48, 0x8f,
0x00, 0xfb, 0xa4, 0x56, 0xce, 0x7b, 0xdc, 0xc0, 0x3e, 0x41, 0xca, 0x02, 0x9b, 0x00, 0xe0, 0x88,
0x9a, 0x04, 0xb5, 0x59, 0xe5, 0x07, 0x8d, 0x1f, 0x58, 0xbf, 0x75, 0xdd, 0x58, 0x50, 0xc6, 0xcb,
0xfa, 0xb1, 0x0c, 0xce, 0x5c, 0x0b, 0x19, 0xbd, 0x17, 0x06, 0x02, 0x77, 0x6f, 0x85, 0xde, 0xba,
0x91, 0x06, 0x61, 0xf0, 0x13, 0xb0, 0x20, 0xc9, 0xf6, 0xb0, 0xc0, 0xaa, 0xae, 0x6a, 0xf3, 0x25,
0x3b, 0x15, 0x51, 0xd2, 0xbb, 0x1d, 0xed, 0x76, 0xe4, 0x02, 0xb7, 0xa5, 0xb7, 0xdd, 0x5f, 0xb3,
0x75, 0x73, 0x9b, 0x44, 0xe0, 0x34, 0x7f, 0xba, 0x86, 0x12, 0x54, 0xf8, 0x11, 0xa8, 0xf0, 0x88,
0xb8, 0xaa, 0xa7, 0x6a, 0xf3, 0x15, 0x7b, 0x8a, 0x44, 0xed, 0x82, 0x4a, 0x6f, 0x47, 0xc4, 0x4d,
0x19, 0x91, 0xff, 0x90, 0xc2, 0x85, 0x77, 0xc1, 0x3c, 0x17, 0x58, 0xf4, 0xb8, 0x62, 0xa3, 0xda,
0x7c, 0xf5, 0xd0, 0x19, 0x14, 0x4a, 0x6b, 0xc9, 0xe4, 0x98, 0xd7, 0xff, 0x91, 0x41, 0xb7, 0xbe,
0x9a, 0x05, 0xab, 0x05, 0x91, 0xed, 0x30, 0xf0, 0xa8, 0xa0, 0x61, 0x00, 0xaf, 0x81, 0x8a, 0xd8,
0x8b, 0x88, 0xd9, 0xe2, 0xcb, 0x71, 0xb9, 0x5b, 0x7b, 0x11, 0x79, 0x32, 0x68, 0x3c, 0x3b, 0x2d,
0x5e, 0xfa, 0x21, 0x85, 0x00, 0x37, 0x92, 0xb6, 0xca, 0x39, 0x2c, 0x53, 0xd6, 0x93, 0x41, 0x63,
0xc2, 0xe1, 0xb4, 0x13, 0xa4, 0x7c, 0xf1, 0xb0, 0x0f, 0x60, 0x17, 0x73, 0xb1, 0xc5, 0x70, 0xc0,
0x75, 0x26, 0xea, 0x13, 0x43, 0xd8, 0x0b, 0xfb, 0xdb, 0x70, 0x19, 0xd1, 0x5a, 0x31, 0x55, 0xc0,
0x8d, 0x31, 0x34, 0x34, 0x21, 0x03, 0x7c, 0x0e, 0xcc, 0x33, 0x82, 0x79, 0x18, 0xd4, 0x2a, 0xaa,
0x8b, 0x84, 0x5c, 0xa4, 0x56, 0x91, 0xb1, 0xc2, 0xe7, 0xc1, 0x31, 0x9f, 0x70, 0x8e, 0x3b, 0xa4,
0x36, 0xa7, 0x1c, 0x97, 0x8d, 0xe3, 0xb1, 0x4d, 0xbd, 0x8c, 0x62, 0xbb, 0xf5, 0x6b, 0x09, 0x9c,
0x2b, 0xe0, 0x71, 0x83, 0x72, 0x01, 0x3f, 0x18, 0x53, 0xb4, 0xbd, 0xbf, 0x06, 0x65, 0xb4, 0xd2,
0xf3, 0x09, 0x93, 0x7b, 0x21, 0x5e, 0xc9, 0xa8, 0xf9, 0x43, 0x30, 0x47, 0x05, 0xf1, 0xe5, 0xae,
0xcc, 0x5e, 0xa8, 0x36, 0xaf, 0x1e, 0x56, 0x6c, 0xad, 0xe3, 0x26, 0xc9, 0xdc, 0x75, 0x09, 0x87,
0x34, 0xaa, 0xf5, 0x5b, 0xb9, 0xb0, 0x39, 0x29, 0x79, 0xf8, 0x39, 0x58, 0x52, 0xff, 0xb6, 0x30,
0xeb, 0x10, 0x39, 0x5a, 0x4c, 0x8b, 0xd3, 0x8f, 0xd5, 0x53, 0x06, 0x53, 0xeb, 0xb4, 0xa9, 0x65,
0xe9, 0x76, 0x0e, 0x1b, 0x8d, 0xe4, 0x82, 0x6b, 0xa0, 0xea, 0xd3, 0x00, 0x91, 0xa8, 0x4b, 0x5d,
0xac, 0x85, 0x39, 0xd7, 0x5a, 0x1e, 0x0e, 0x1a, 0xd5, 0xcd, 0x74, 0x19, 0x65, 0x7d, 0xe0, 0x15,
0x50, 0xf5, 0xf1, 0x67, 0x49, 0xc8, 0xac, 0x0a, 0x39, 0x69, 0xf2, 0x55, 0x37, 0x53, 0x13, 0xca,
0xfa, 0xc1, 0x3b, 0x52, 0x0f, 0x82, 0x51, 0x97, 0xd7, 0x2a, 0x8a, 0xe8, 0x17, 0xa7, 0x36, 0xb8,
0xa9, 0xfc, 0xd5, 0x98, 0xc8, 0x88, 0x47, 0x61, 0xa0, 0x18, 0xcc, 0xfa, 0xbe, 0x02, 0xce, 0x3f,
0xf5, 0xf8, 0xc3, 0xd7, 0x01, 0x0c, 0xb7, 0x39, 0x61, 0x7d, 0xe2, 0xbd, 0xa1, 0xe7, 0xbb, 0x1c,
0xb4, 0x92, 0xe5, 0xd9, 0xd6, 0x69, 0xa9, 0xfc, 0x9b, 0x63, 0x56, 0x34, 0x21, 0x02, 0xba, 0xe0,
0xb8, 0x3c, 0x0f, 0x9a, 0x51, 0x6a, 0x66, 0xfa, 0xc1, 0x0e, 0xdb, 0xff, 0x87, 0x83, 0xc6, 0xf1,
0x8d, 0x2c, 0x08, 0xca, 0x63, 0xc2, 0x75, 0xb0, 0xec, 0xf6, 0x18, 0x23, 0x81, 0x18, 0x61, 0xf8,
0x8c, 0x61, 0x60, 0xb9, 0x9d, 0x37, 0xa3, 0x51, 0x7f, 0x09, 0xe1, 0x11, 0x4e, 0x19, 0xf1, 0x12,
0x88, 0x4a, 0x1e, 0xe2, 0xb5, 0xbc, 0x19, 0x8d, 0xfa, 0x43, 0x1f, 0x2c, 0x19, 0x54, 0xc3, 0x77,
0x6d, 0x4e, 0xed, 0xd9, 0xc5, 0xfd, 0xee, 0x99, 0x1e, 0xbc, 0x89, 0x0a, 0xdb, 0x39, 0x30, 0x34,
0x02, 0x0e, 0x7b, 0x00, 0xb8, 0xf1, 0x98, 0xe3, 0xb5, 0x79, 0x95, 0x6a, 0xfd, 0xb0, 0xe7, 0x30,
0x19, 0x98, 0xe9, 0x2d, 0x96, 0x2c, 0x71, 0x94, 0x49, 0x64, 0xfd, 0x5c, 0x06, 0x20, 0xd5, 0x18,
0xbc, 0x9c, 0x9b, 0xf4, 0xab, 0x23, 0x93, 0xfe, 0x84, 0xf1, 0x54, 0x8f, 0x9f, 0xcc, 0x54, 0x7f,
0x07, 0xcc, 0x87, 0xea, 0xf0, 0x19, 0x39, 0x5c, 0x9a, 0x5a, 0x77, 0x72, 0xa7, 0x26, 0x70, 0x2d,
0x20, 0x07, 0xa8, 0x39, 0xc3, 0x06, 0x0e, 0xde, 0x04, 0x95, 0x28, 0xf4, 0xe2, 0x3b, 0x70, 0x6d,
0x2a, 0xec, 0xad, 0xd0, 0xe3, 0x39, 0xd0, 0x05, 0x59, 0xbd, 0x5c, 0x45, 0x0a, 0x08, 0x7e, 0x0c,
0x16, 0xe2, 0xc7, 0x9b, 0x12, 0x44, 0xb5, 0x79, 0x65, 0x2a, 0x28, 0x32, 0x01, 0x39, 0xe0, 0x45,
0x39, 0x49, 0x63, 0x0b, 0x4a, 0x40, 0xad, 0x5f, 0xca, 0x60, 0x31, 0xbb, 0xff, 0xff, 0x0e, 0xa3,
0x5a, 0x7a, 0x47, 0xcc, 0xa8, 0x06, 0xfd, 0x1b, 0x18, 0xd5, 0xc0, 0x45, 0x8c, 0xde, 0x2f, 0x03,
0x38, 0x2e, 0x17, 0xe8, 0x81, 0x79, 0xa1, 0x46, 0xf8, 0x91, 0xdc, 0x15, 0xc9, 0x0d, 0x6e, 0xae,
0x05, 0x83, 0x2d, 0x1f, 0xa6, 0x7a, 0xc8, 0xde, 0x48, 0x1f, 0xb0, 0xc9, 0x91, 0xda, 0x4c, 0x2c,
0x28, 0xe3, 0x05, 0x09, 0xa8, 0xea, 0xe8, 0x3b, 0xb8, 0xdb, 0x8b, 0x9f, 0x23, 0x4f, 0xbd, 0xad,
0xed, 0xb8, 0x59, 0xfb, 0xad, 0x1e, 0x0e, 0x04, 0x15, 0x7b, 0xe9, 0x65, 0xb2, 0x95, 0x42, 0xa1,
0x2c, 0xae, 0xf5, 0xcd, 0x28, 0x2f, 0x5a, 0x6f, 0xff, 0x5d, 0x5e, 0x76, 0xc0, 0xa2, 0x99, 0x79,
0x7f, 0x85, 0x98, 0x53, 0x26, 0xcb, 0x62, 0x3b, 0x83, 0x85, 0x72, 0xc8, 0xd6, 0x0f, 0x25, 0x70,
0x62, 0x74, 0x14, 0x8c, 0x94, 0x5c, 0xda, 0x57, 0xc9, 0xf7, 0x00, 0xd4, 0x0d, 0xaf, 0xf7, 0x09,
0xc3, 0x1d, 0xa2, 0x0b, 0x2f, 0x1f, 0xaa, 0xf0, 0xe4, 0x91, 0xb9, 0x35, 0x86, 0x88, 0x26, 0x64,
0xb1, 0x7e, 0xca, 0x37, 0xa1, 0x77, 0xf7, 0x30, 0x4d, 0x7c, 0x01, 0x4e, 0x1a, 0x76, 0x8e, 0xa0,
0x8b, 0x73, 0x26, 0xd9, 0xc9, 0xf6, 0x38, 0x24, 0x9a, 0x94, 0xc7, 0xfa, 0xb6, 0x0c, 0x4e, 0x4d,
0x1a, 0xa1, 0xb0, 0x6d, 0x3e, 0x0b, 0x75, 0x17, 0x4e, 0xf6, 0xb3, 0xf0, 0xc9, 0xa0, 0xd1, 0x98,
0xf0, 0x1d, 0x10, 0xc3, 0x64, 0xbe, 0x1c, 0xdf, 0x05, 0xb5, 0x1c, 0x77, 0x6f, 0x0b, 0xda, 0xa5,
0xf7, 0xf4, 0xf3, 0x46, 0xbf, 0xe4, 0x9e, 0x19, 0x0e, 0x1a, 0xb5, 0xad, 0x02, 0x1f, 0x54, 0x18,
0x2d, 0x3f, 0x2e, 0x26, 0xec, 0xfd, 0xe1, 0x44, 0x7b, 0xfa, 0x00, 0xfb, 0xfe, 0xdd, 0x38, 0x5f,
0x7a, 0xef, 0x8f, 0x84, 0xaf, 0xf7, 0xc1, 0xd9, 0xfc, 0x26, 0x8d, 0x13, 0x76, 0x7e, 0x38, 0x68,
0x9c, 0x6d, 0x17, 0x39, 0xa1, 0xe2, 0xf8, 0x22, 0xa5, 0xcd, 0xfe, 0x33, 0x4a, 0x6b, 0xd9, 0x0f,
0x1e, 0xd7, 0x67, 0x1e, 0x3e, 0xae, 0xcf, 0x3c, 0x7a, 0x5c, 0x9f, 0xf9, 0x72, 0x58, 0x2f, 0x3d,
0x18, 0xd6, 0x4b, 0x0f, 0x87, 0xf5, 0xd2, 0xa3, 0x61, 0xbd, 0xf4, 0xfb, 0xb0, 0x5e, 0xfa, 0xfa,
0x8f, 0xfa, 0xcc, 0x7b, 0x0b, 0xf1, 0xe0, 0xfb, 0x33, 0x00, 0x00, 0xff, 0xff, 0x57, 0x59, 0x55,
0xf6, 0xa2, 0x12, 0x00, 0x00,
// 1316 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x57, 0xcd, 0x6f, 0x1b, 0x45,
0x14, 0x8f, 0x1d, 0x27, 0x0d, 0xe3, 0x34, 0x29, 0xd3, 0xaa, 0x75, 0x53, 0x6a, 0x47, 0x2b, 0x84,
0x4a, 0x45, 0x77, 0x5b, 0x13, 0x3e, 0x24, 0x84, 0x44, 0x6c, 0x44, 0x5b, 0x91, 0xb4, 0x65, 0x9a,
0x56, 0x08, 0x0a, 0x62, 0xb2, 0x3b, 0x75, 0x86, 0x78, 0x3f, 0x34, 0x33, 0xb6, 0x48, 0x11, 0x12,
0x17, 0xee, 0x1c, 0x40, 0xfc, 0x15, 0x5c, 0xe1, 0x0c, 0x12, 0x52, 0x85, 0x38, 0xf4, 0x58, 0x84,
0x64, 0x51, 0xf3, 0x5f, 0xf4, 0x84, 0xe6, 0xc3, 0xfb, 0x61, 0x7b, 0xe3, 0xc4, 0x44, 0xc0, 0xcd,
0x3b, 0xef, 0xf7, 0x7e, 0xef, 0xbd, 0xdf, 0xbc, 0x79, 0x33, 0x06, 0x57, 0x77, 0x5f, 0xe7, 0x36,
0x0d, 0x9d, 0xdd, 0xce, 0x36, 0x61, 0x01, 0x11, 0x84, 0x3b, 0x5d, 0x12, 0x78, 0x21, 0x73, 0x8c,
0x01, 0x47, 0xd4, 0xc1, 0x1d, 0x11, 0x72, 0x17, 0xb7, 0x69, 0xd0, 0x72, 0xba, 0xf5, 0x6d, 0x22,
0xf0, 0x15, 0xa7, 0x45, 0x02, 0xc2, 0xb0, 0x20, 0x9e, 0x1d, 0xb1, 0x50, 0x84, 0xb0, 0xaa, 0xf1,
0x36, 0x8e, 0xa8, 0x9d, 0xc2, 0xdb, 0x06, 0xbf, 0x72, 0xa9, 0x45, 0xc5, 0x4e, 0x67, 0xdb, 0x76,
0x43, 0xdf, 0x69, 0x85, 0xad, 0xd0, 0x51, 0x6e, 0xdb, 0x9d, 0xfb, 0xea, 0x4b, 0x7d, 0xa8, 0x5f,
0x9a, 0x6e, 0xc5, 0x4a, 0x85, 0x77, 0x43, 0x46, 0x9c, 0xee, 0x48, 0xc8, 0x95, 0xb5, 0x04, 0xe3,
0x63, 0x77, 0x87, 0x06, 0x84, 0xed, 0x39, 0xd1, 0x6e, 0x4b, 0x39, 0x31, 0xc2, 0xc3, 0x0e, 0x73,
0xc9, 0xa1, 0xbc, 0xb8, 0xe3, 0x13, 0x81, 0xc7, 0xc5, 0x72, 0xf2, 0xbc, 0x58, 0x27, 0x10, 0xd4,
0x1f, 0x0d, 0xf3, 0xea, 0x24, 0x07, 0xee, 0xee, 0x10, 0x1f, 0x8f, 0xf8, 0xbd, 0x9c, 0xe7, 0xd7,
0x11, 0xb4, 0xed, 0xd0, 0x40, 0x70, 0xc1, 0x86, 0x9d, 0xac, 0x6f, 0x0b, 0xe0, 0x5c, 0x93, 0x85,
0x9c, 0xdf, 0x25, 0x8c, 0xd3, 0x30, 0xb8, 0xb9, 0xfd, 0x29, 0x71, 0x05, 0x22, 0xf7, 0x09, 0x23,
0x81, 0x4b, 0xe0, 0x2a, 0x28, 0xed, 0xd2, 0xc0, 0xab, 0x14, 0x56, 0x0b, 0x17, 0x9e, 0x69, 0x2c,
0x3e, 0xec, 0xd5, 0x66, 0xfa, 0xbd, 0x5a, 0xe9, 0x5d, 0x1a, 0x78, 0x48, 0x59, 0x24, 0x22, 0xc0,
0x3e, 0xa9, 0x14, 0xb3, 0x88, 0x1b, 0xd8, 0x27, 0x48, 0x59, 0x60, 0x1d, 0x00, 0x1c, 0x51, 0x13,
0xa0, 0x32, 0xab, 0x70, 0xd0, 0xe0, 0xc0, 0xfa, 0xad, 0xeb, 0xc6, 0x82, 0x52, 0x28, 0xeb, 0xa7,
0x22, 0x38, 0x73, 0x2d, 0x64, 0xf4, 0x41, 0x18, 0x08, 0xdc, 0xbe, 0x15, 0x7a, 0xeb, 0xa6, 0x33,
0x08, 0x83, 0x9f, 0x80, 0x05, 0x29, 0xb6, 0x87, 0x05, 0x56, 0x79, 0x95, 0xeb, 0x97, 0xed, 0xa4,
0x87, 0xe2, 0xda, 0xed, 0x68, 0xb7, 0x25, 0x17, 0xb8, 0x2d, 0xd1, 0x76, 0xf7, 0x8a, 0xad, 0x8b,
0xdb, 0x24, 0x02, 0x27, 0xf1, 0x93, 0x35, 0x14, 0xb3, 0xc2, 0x8f, 0x40, 0x89, 0x47, 0xc4, 0x55,
0x35, 0x95, 0xeb, 0x6f, 0xd8, 0xfb, 0x77, 0xa8, 0x9d, 0x93, 0xe8, 0xed, 0x88, 0xb8, 0x89, 0x20,
0xf2, 0x0b, 0x29, 0x5a, 0x48, 0xc0, 0x3c, 0x17, 0x58, 0x74, 0xb8, 0x12, 0xa3, 0x5c, 0x7f, 0x73,
0xda, 0x00, 0x8a, 0xa4, 0xb1, 0x64, 0x42, 0xcc, 0xeb, 0x6f, 0x64, 0xc8, 0xad, 0xaf, 0x66, 0xc1,
0x6a, 0x8e, 0x67, 0x33, 0x0c, 0x3c, 0x2a, 0x68, 0x18, 0xc0, 0x6b, 0xa0, 0x24, 0xf6, 0x22, 0x62,
0x36, 0x78, 0x6d, 0x90, 0xed, 0xd6, 0x5e, 0x44, 0x9e, 0xf6, 0x6a, 0xcf, 0x4f, 0xf2, 0x97, 0x38,
0xa4, 0x18, 0xe0, 0x46, 0x5c, 0x55, 0x31, 0xc3, 0x65, 0xd2, 0x7a, 0xda, 0xab, 0x8d, 0x39, 0x9a,
0x76, 0xcc, 0x94, 0x4d, 0x1e, 0x76, 0x01, 0x6c, 0x63, 0x2e, 0xb6, 0x18, 0x0e, 0xb8, 0x8e, 0x44,
0x7d, 0x62, 0xf4, 0xba, 0x78, 0xb0, 0xed, 0x96, 0x1e, 0x8d, 0x15, 0x93, 0x05, 0xdc, 0x18, 0x61,
0x43, 0x63, 0x22, 0xc0, 0x17, 0xc0, 0x3c, 0x23, 0x98, 0x87, 0x41, 0xa5, 0xa4, 0xaa, 0x88, 0xc5,
0x45, 0x6a, 0x15, 0x19, 0x2b, 0x7c, 0x11, 0x1c, 0xf3, 0x09, 0xe7, 0xb8, 0x45, 0x2a, 0x73, 0x0a,
0xb8, 0x6c, 0x80, 0xc7, 0x36, 0xf5, 0x32, 0x1a, 0xd8, 0xad, 0xdf, 0x0b, 0xe0, 0x5c, 0x8e, 0x8e,
0x1b, 0x94, 0x0b, 0x78, 0x6f, 0xa4, 0x9f, 0xed, 0x83, 0x15, 0x28, 0xbd, 0x55, 0x37, 0x9f, 0x30,
0xb1, 0x17, 0x06, 0x2b, 0xa9, 0x5e, 0xbe, 0x07, 0xe6, 0xa8, 0x20, 0xbe, 0xdc, 0x95, 0xd9, 0x0b,
0xe5, 0xfa, 0x6b, 0x53, 0xf6, 0x5a, 0xe3, 0xb8, 0x89, 0x31, 0x77, 0x5d, 0xb2, 0x21, 0x4d, 0x6a,
0xfd, 0x51, 0xcc, 0xad, 0x4d, 0x36, 0x3c, 0xfc, 0x1c, 0x2c, 0xa9, 0xaf, 0x2d, 0xcc, 0x5a, 0x44,
0xce, 0x15, 0x53, 0xe1, 0xc4, 0x33, 0xb5, 0xcf, 0x50, 0x6a, 0x9c, 0x36, 0xa9, 0x2c, 0xdd, 0xce,
0x50, 0xa3, 0xa1, 0x50, 0xf0, 0x0a, 0x28, 0xfb, 0x34, 0x40, 0x24, 0x6a, 0x53, 0x17, 0xeb, 0xb6,
0x9c, 0x6b, 0x2c, 0xf7, 0x7b, 0xb5, 0xf2, 0x66, 0xb2, 0x8c, 0xd2, 0x18, 0xf8, 0x0a, 0x28, 0xfb,
0xf8, 0xb3, 0xd8, 0x65, 0x56, 0xb9, 0x9c, 0x34, 0xf1, 0xca, 0x9b, 0x89, 0x09, 0xa5, 0x71, 0xf0,
0x8e, 0xec, 0x06, 0xc1, 0xa8, 0xcb, 0x2b, 0x25, 0x25, 0xf3, 0xc5, 0x49, 0xf5, 0x6d, 0x2a, 0xb8,
0x1a, 0x11, 0xa9, 0xce, 0x51, 0x14, 0x68, 0xc0, 0x65, 0xfd, 0x50, 0x02, 0xe7, 0xf7, 0x3d, 0xfb,
0xf0, 0x1d, 0x00, 0xc3, 0x6d, 0x4e, 0x58, 0x97, 0x78, 0x57, 0xf5, 0x68, 0x97, 0x33, 0x56, 0x6a,
0x3c, 0xdb, 0x38, 0x2d, 0xdb, 0xfe, 0xe6, 0x88, 0x15, 0x8d, 0xf1, 0x80, 0x2e, 0x38, 0x2e, 0x0f,
0x83, 0x16, 0x94, 0x9a, 0x71, 0x7e, 0xb8, 0x93, 0xf6, 0x6c, 0xbf, 0x57, 0x3b, 0xbe, 0x91, 0x26,
0x41, 0x59, 0x4e, 0xb8, 0x0e, 0x96, 0xdd, 0x0e, 0x63, 0x24, 0x10, 0x43, 0x02, 0x9f, 0x31, 0x0a,
0x2c, 0x37, 0xb3, 0x66, 0x34, 0x8c, 0x97, 0x14, 0x1e, 0xe1, 0x94, 0x11, 0x2f, 0xa6, 0x28, 0x65,
0x29, 0xde, 0xce, 0x9a, 0xd1, 0x30, 0x1e, 0xb6, 0xc1, 0x92, 0x61, 0x35, 0x7a, 0x57, 0xe6, 0xd4,
0x96, 0xbd, 0x74, 0xc0, 0x2d, 0xd3, 0x43, 0x37, 0xee, 0xc1, 0x66, 0x86, 0x0b, 0x0d, 0x71, 0x43,
0x01, 0x80, 0x3b, 0x18, 0x71, 0xbc, 0x32, 0xaf, 0x22, 0xbd, 0x35, 0xe5, 0x19, 0x8c, 0x67, 0x65,
0x72, 0x7d, 0xc5, 0x4b, 0x1c, 0xa5, 0xe2, 0x58, 0xbf, 0x16, 0x01, 0x48, 0x3a, 0x0c, 0xae, 0x65,
0x86, 0xfc, 0xea, 0xd0, 0x90, 0x3f, 0x61, 0x90, 0xea, 0xd5, 0x93, 0x1a, 0xe8, 0x77, 0xc1, 0x7c,
0xa8, 0x4e, 0x9e, 0x69, 0x86, 0xfa, 0xa4, 0xb4, 0xe3, 0xbb, 0x34, 0x66, 0x6b, 0x00, 0x39, 0x3a,
0xcd, 0xf9, 0x35, 0x6c, 0xf0, 0x06, 0x28, 0x45, 0xa1, 0x37, 0xb8, 0xfc, 0x2e, 0x4f, 0x62, 0xbd,
0x15, 0x7a, 0x3c, 0xc3, 0xb9, 0x20, 0x73, 0x97, 0xab, 0x48, 0xf1, 0xc0, 0x8f, 0xc1, 0xc2, 0xe0,
0xcd, 0xa6, 0x9a, 0xa1, 0x5c, 0x5f, 0x9b, 0xc4, 0x89, 0x0c, 0x3e, 0xc3, 0xbb, 0x28, 0x27, 0xe8,
0xc0, 0x82, 0x62, 0x4e, 0xeb, 0xb7, 0x22, 0x58, 0x4c, 0xef, 0xfd, 0x7f, 0x22, 0xa7, 0xee, 0xba,
0xa3, 0x95, 0x53, 0x73, 0x1e, 0xbd, 0x9c, 0x9a, 0x37, 0x4f, 0xce, 0x6f, 0x8a, 0x00, 0x8e, 0x76,
0x0a, 0x74, 0xc1, 0xbc, 0x50, 0x93, 0xfb, 0x28, 0x6e, 0x88, 0xf8, 0xd6, 0x36, 0x97, 0x81, 0xa1,
0x96, 0x4f, 0x51, 0x3d, 0x5b, 0x6f, 0x24, 0x4f, 0xd6, 0xf8, 0x2c, 0x6d, 0xc6, 0x16, 0x94, 0x42,
0x41, 0x02, 0xca, 0xda, 0xfb, 0x2e, 0x6e, 0x77, 0x06, 0x4f, 0x90, 0x7d, 0x6f, 0x68, 0x7b, 0x50,
0xab, 0xfd, 0x5e, 0x07, 0x07, 0x82, 0x8a, 0xbd, 0xe4, 0x0a, 0xd9, 0x4a, 0xa8, 0x50, 0x9a, 0xd7,
0xfa, 0x6e, 0x58, 0x16, 0xdd, 0x6b, 0xff, 0x5b, 0x59, 0x76, 0xc0, 0xa2, 0x19, 0x75, 0xff, 0x44,
0x97, 0x53, 0x26, 0xca, 0x62, 0x33, 0xc5, 0x85, 0x32, 0xcc, 0xd6, 0xcf, 0x05, 0x70, 0x62, 0x78,
0x08, 0x0c, 0xa5, 0x5c, 0x38, 0x50, 0xca, 0x0f, 0x00, 0xd4, 0x05, 0xaf, 0x77, 0x09, 0xc3, 0x2d,
0xa2, 0x13, 0x2f, 0x4e, 0x95, 0x78, 0xfc, 0xae, 0xdc, 0x1a, 0x61, 0x44, 0x63, 0xa2, 0x58, 0xbf,
0x64, 0x8b, 0xd0, 0x9b, 0x3b, 0x4d, 0x11, 0x5f, 0x80, 0x93, 0x46, 0x9d, 0x23, 0xa8, 0xe2, 0x9c,
0x09, 0x76, 0xb2, 0x39, 0x4a, 0x89, 0xc6, 0xc5, 0xb1, 0xbe, 0x2f, 0x82, 0x53, 0xe3, 0xa6, 0x27,
0x6c, 0x9a, 0xff, 0x81, 0xba, 0x0a, 0x27, 0xfd, 0x3f, 0xf0, 0x69, 0xaf, 0x56, 0x1b, 0xf3, 0xf4,
0x1f, 0xd0, 0xa4, 0xfe, 0x2a, 0xbe, 0x0f, 0x2a, 0x19, 0xed, 0xee, 0x08, 0xda, 0xa6, 0x0f, 0xf4,
0xa3, 0x46, 0x3f, 0xdf, 0x9e, 0xeb, 0xf7, 0x6a, 0x95, 0xad, 0x1c, 0x0c, 0xca, 0xf5, 0x96, 0xff,
0x27, 0xc6, 0xec, 0xfd, 0x74, 0x4d, 0x7b, 0xfa, 0x10, 0xfb, 0xfe, 0xe3, 0xa8, 0x5e, 0x7a, 0xef,
0x8f, 0x44, 0xaf, 0x0f, 0xc1, 0xd9, 0xec, 0x26, 0x8d, 0x0a, 0x76, 0xbe, 0xdf, 0xab, 0x9d, 0x6d,
0xe6, 0x81, 0x50, 0xbe, 0x7f, 0x5e, 0xa7, 0xcd, 0xfe, 0x3b, 0x9d, 0xd6, 0xb8, 0xf4, 0xf0, 0x49,
0x75, 0xe6, 0xd1, 0x93, 0xea, 0xcc, 0xe3, 0x27, 0xd5, 0x99, 0x2f, 0xfb, 0xd5, 0xc2, 0xc3, 0x7e,
0xb5, 0xf0, 0xa8, 0x5f, 0x2d, 0x3c, 0xee, 0x57, 0x0b, 0x7f, 0xf6, 0xab, 0x85, 0xaf, 0xff, 0xaa,
0xce, 0x7c, 0x70, 0xcc, 0xcc, 0xbd, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0xac, 0xf1, 0x6a, 0x4f,
0x90, 0x12, 0x00, 0x00,
}

4
staging/src/k8s.io/api/autoscaling/v2alpha1/generated.proto → staging/src/k8s.io/api/autoscaling/v2beta1/generated.proto
View File

@ -19,7 +19,7 @@ limitations under the License.
syntax = 'proto2';
package k8s.io.api.autoscaling.v2alpha1;
package k8s.io.api.autoscaling.v2beta1;
import "k8s.io/api/core/v1/generated.proto";
import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
@ -29,7 +29,7 @@ import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
// Package-wide variables from generator "generated".
option go_package = "v2alpha1";
option go_package = "v2beta1";
// CrossVersionObjectReference contains enough information to let you identify the referred resource.
message CrossVersionObjectReference {

4
staging/src/k8s.io/api/autoscaling/v2alpha1/register.go → staging/src/k8s.io/api/autoscaling/v2beta1/register.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package v2alpha1
package v2beta1
import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -26,7 +26,7 @@ import (
const GroupName = "autoscaling"
// SchemeGroupVersion is group version used to register these objects
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v2alpha1"}
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v2beta1"}
// Resource takes an unqualified resource and returns a Group qualified GroupResource
func Resource(resource string) schema.GroupResource {

2
staging/src/k8s.io/api/autoscaling/v2alpha1/types.go → staging/src/k8s.io/api/autoscaling/v2beta1/types.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package v2alpha1
package v2beta1
import (
"k8s.io/api/core/v1"

2
staging/src/k8s.io/api/autoscaling/v2alpha1/types_swagger_doc_generated.go → staging/src/k8s.io/api/autoscaling/v2beta1/types_swagger_doc_generated.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package v2alpha1
package v2beta1
// This file contains a collection of methods that can be used from go-restful to
// generate Swagger API documentation for its models. Please read this PR for more

2
staging/src/k8s.io/api/autoscaling/v2alpha1/zz_generated.deepcopy.go → staging/src/k8s.io/api/autoscaling/v2beta1/zz_generated.deepcopy.go
View File

@ -18,7 +18,7 @@ limitations under the License.
// This file was autogenerated by deepcopy-gen. Do not edit it manually!
package v2alpha1
package v2beta1
import (
resource "k8s.io/apimachinery/pkg/api/resource"

2
staging/src/k8s.io/client-go/informers/BUILD
View File

@ -16,7 +16,7 @@ go_library(
"//vendor/k8s.io/api/apps/v1beta1:go_default_library",
"//vendor/k8s.io/api/apps/v1beta2:go_default_library",
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/api/batch/v1:go_default_library",
"//vendor/k8s.io/api/batch/v1beta1:go_default_library",
"//vendor/k8s.io/api/batch/v2alpha1:go_default_library",

13
staging/src/k8s.io/client-go/informers/autoscaling/BUILD
View File

@ -1,16 +1,12 @@
package(default_visibility = ["//visibility:public"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
srcs = ["interface.go"],
visibility = ["//visibility:public"],
deps = [
"//vendor/k8s.io/client-go/informers/autoscaling/v1:go_default_library",
"//vendor/k8s.io/client-go/informers/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/client-go/informers/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
],
)
@ -27,7 +23,8 @@ filegroup(
srcs = [
":package-srcs",
"//staging/src/k8s.io/client-go/informers/autoscaling/v1:all-srcs",
"//staging/src/k8s.io/client-go/informers/autoscaling/v2alpha1:all-srcs",
"//staging/src/k8s.io/client-go/informers/autoscaling/v2beta1:all-srcs",
],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

12
staging/src/k8s.io/client-go/informers/autoscaling/interface.go
View File

@ -20,7 +20,7 @@ package autoscaling
import (
v1 "k8s.io/client-go/informers/autoscaling/v1"
v2alpha1 "k8s.io/client-go/informers/autoscaling/v2alpha1"
v2beta1 "k8s.io/client-go/informers/autoscaling/v2beta1"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
)
@ -28,8 +28,8 @@ import (
type Interface interface {
// V1 provides access to shared informers for resources in V1.
V1() v1.Interface
// V2alpha1 provides access to shared informers for resources in V2alpha1.
V2alpha1() v2alpha1.Interface
// V2beta1 provides access to shared informers for resources in V2beta1.
V2beta1() v2beta1.Interface
}
type group struct {
@ -46,7 +46,7 @@ func (g *group) V1() v1.Interface {
return v1.New(g.SharedInformerFactory)
}
// V2alpha1 returns a new v2alpha1.Interface.
func (g *group) V2alpha1() v2alpha1.Interface {
return v2alpha1.New(g.SharedInformerFactory)
// V2beta1 returns a new v2beta1.Interface.
func (g *group) V2beta1() v2beta1.Interface {
return v2beta1.New(g.SharedInformerFactory)
}

9
staging/src/k8s.io/client-go/informers/autoscaling/v1/BUILD
View File

@ -1,9 +1,4 @@
package(default_visibility = ["//visibility:public"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
@ -11,6 +6,7 @@ go_library(
"horizontalpodautoscaler.go",
"interface.go",
],
visibility = ["//visibility:public"],
deps = [
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@ -34,4 +30,5 @@ filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

13
staging/src/k8s.io/client-go/informers/autoscaling/v2alpha1/BUILD → staging/src/k8s.io/client-go/informers/autoscaling/v2beta1/BUILD
View File

@ -1,9 +1,4 @@
package(default_visibility = ["//visibility:public"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
@ -11,14 +6,15 @@ go_library(
"horizontalpodautoscaler.go",
"interface.go",
],
visibility = ["//visibility:public"],
deps = [
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
"//vendor/k8s.io/client-go/listers/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/client-go/listers/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/client-go/tools/cache:go_default_library",
],
)
@ -34,4 +30,5 @@ filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

20
staging/src/k8s.io/client-go/informers/autoscaling/v2alpha1/horizontalpodautoscaler.go → staging/src/k8s.io/client-go/informers/autoscaling/v2beta1/horizontalpodautoscaler.go
View File

@ -16,16 +16,16 @@ limitations under the License.
// This file was automatically generated by informer-gen
package v2alpha1
package v2beta1
import (
autoscaling_v2alpha1 "k8s.io/api/autoscaling/v2alpha1"
autoscaling_v2beta1 "k8s.io/api/autoscaling/v2beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
watch "k8s.io/apimachinery/pkg/watch"
internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
kubernetes "k8s.io/client-go/kubernetes"
v2alpha1 "k8s.io/client-go/listers/autoscaling/v2alpha1"
v2beta1 "k8s.io/client-go/listers/autoscaling/v2beta1"
cache "k8s.io/client-go/tools/cache"
time "time"
)
@ -34,7 +34,7 @@ import (
// HorizontalPodAutoscalers.
type HorizontalPodAutoscalerInformer interface {
Informer() cache.SharedIndexInformer
Lister() v2alpha1.HorizontalPodAutoscalerLister
Lister() v2beta1.HorizontalPodAutoscalerLister
}
type horizontalPodAutoscalerInformer struct {
@ -48,13 +48,13 @@ func NewHorizontalPodAutoscalerInformer(client kubernetes.Interface, namespace s
return cache.NewSharedIndexInformer(
&cache.ListWatch{
ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
return client.AutoscalingV2alpha1().HorizontalPodAutoscalers(namespace).List(options)
return client.AutoscalingV2beta1().HorizontalPodAutoscalers(namespace).List(options)
},
WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
return client.AutoscalingV2alpha1().HorizontalPodAutoscalers(namespace).Watch(options)
return client.AutoscalingV2beta1().HorizontalPodAutoscalers(namespace).Watch(options)
},
},
&autoscaling_v2alpha1.HorizontalPodAutoscaler{},
&autoscaling_v2beta1.HorizontalPodAutoscaler{},
resyncPeriod,
indexers,
)
@ -65,9 +65,9 @@ func defaultHorizontalPodAutoscalerInformer(client kubernetes.Interface, resyncP
}
func (f *horizontalPodAutoscalerInformer) Informer() cache.SharedIndexInformer {
return f.factory.InformerFor(&autoscaling_v2alpha1.HorizontalPodAutoscaler{}, defaultHorizontalPodAutoscalerInformer)
return f.factory.InformerFor(&autoscaling_v2beta1.HorizontalPodAutoscaler{}, defaultHorizontalPodAutoscalerInformer)
}
func (f *horizontalPodAutoscalerInformer) Lister() v2alpha1.HorizontalPodAutoscalerLister {
return v2alpha1.NewHorizontalPodAutoscalerLister(f.Informer().GetIndexer())
func (f *horizontalPodAutoscalerInformer) Lister() v2beta1.HorizontalPodAutoscalerLister {
return v2beta1.NewHorizontalPodAutoscalerLister(f.Informer().GetIndexer())
}

2
staging/src/k8s.io/client-go/informers/autoscaling/v2alpha1/interface.go → staging/src/k8s.io/client-go/informers/autoscaling/v2beta1/interface.go
View File

@ -16,7 +16,7 @@ limitations under the License.
// This file was automatically generated by informer-gen
package v2alpha1
package v2beta1
import (
internalinterfaces "k8s.io/client-go/informers/internalinterfaces"

12
staging/src/k8s.io/client-go/informers/generic.go
View File

@ -24,10 +24,10 @@ import (
v1beta1 "k8s.io/api/apps/v1beta1"
v1beta2 "k8s.io/api/apps/v1beta2"
v1 "k8s.io/api/autoscaling/v1"
v2alpha1 "k8s.io/api/autoscaling/v2alpha1"
v2beta1 "k8s.io/api/autoscaling/v2beta1"
batch_v1 "k8s.io/api/batch/v1"
batch_v1beta1 "k8s.io/api/batch/v1beta1"
batch_v2alpha1 "k8s.io/api/batch/v2alpha1"
v2alpha1 "k8s.io/api/batch/v2alpha1"
certificates_v1beta1 "k8s.io/api/certificates/v1beta1"
core_v1 "k8s.io/api/core/v1"
extensions_v1beta1 "k8s.io/api/extensions/v1beta1"
@ -100,9 +100,9 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
case v1.SchemeGroupVersion.WithResource("horizontalpodautoscalers"):
return &genericInformer{resource: resource.GroupResource(), informer: f.Autoscaling().V1().HorizontalPodAutoscalers().Informer()}, nil
// Group=Autoscaling, Version=V2alpha1
case v2alpha1.SchemeGroupVersion.WithResource("horizontalpodautoscalers"):
return &genericInformer{resource: resource.GroupResource(), informer: f.Autoscaling().V2alpha1().HorizontalPodAutoscalers().Informer()}, nil
// Group=Autoscaling, Version=V2beta1
case v2beta1.SchemeGroupVersion.WithResource("horizontalpodautoscalers"):
return &genericInformer{resource: resource.GroupResource(), informer: f.Autoscaling().V2beta1().HorizontalPodAutoscalers().Informer()}, nil
// Group=Batch, Version=V1
case batch_v1.SchemeGroupVersion.WithResource("jobs"):
@ -113,7 +113,7 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
return &genericInformer{resource: resource.GroupResource(), informer: f.Batch().V1beta1().CronJobs().Informer()}, nil
// Group=Batch, Version=V2alpha1
case batch_v2alpha1.SchemeGroupVersion.WithResource("cronjobs"):
case v2alpha1.SchemeGroupVersion.WithResource("cronjobs"):
return &genericInformer{resource: resource.GroupResource(), informer: f.Batch().V2alpha1().CronJobs().Informer()}, nil
// Group=Certificates, Version=V1beta1

4
staging/src/k8s.io/client-go/kubernetes/BUILD
View File

@ -23,7 +23,7 @@ go_library(
"//vendor/k8s.io/client-go/kubernetes/typed/authorization/v1:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/authorization/v1beta1:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v1:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/batch/v1:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/batch/v1beta1:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/batch/v2alpha1:go_default_library",
@ -65,7 +65,7 @@ filegroup(
"//staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1:all-srcs",
"//staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1:all-srcs",
"//staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1:all-srcs",
"//staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1:all-srcs",
"//staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1:all-srcs",
"//staging/src/k8s.io/client-go/kubernetes/typed/batch/v1:all-srcs",
"//staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1:all-srcs",
"//staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1:all-srcs",

18
staging/src/k8s.io/client-go/kubernetes/clientset.go
View File

@ -27,7 +27,7 @@ import (
authorizationv1 "k8s.io/client-go/kubernetes/typed/authorization/v1"
authorizationv1beta1 "k8s.io/client-go/kubernetes/typed/authorization/v1beta1"
autoscalingv1 "k8s.io/client-go/kubernetes/typed/autoscaling/v1"
autoscalingv2alpha1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1"
autoscalingv2beta1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1"
batchv1 "k8s.io/client-go/kubernetes/typed/batch/v1"
batchv1beta1 "k8s.io/client-go/kubernetes/typed/batch/v1beta1"
batchv2alpha1 "k8s.io/client-go/kubernetes/typed/batch/v2alpha1"
@ -67,7 +67,7 @@ type Interface interface {
AutoscalingV1() autoscalingv1.AutoscalingV1Interface
// Deprecated: please explicitly pick a version if possible.
Autoscaling() autoscalingv1.AutoscalingV1Interface
AutoscalingV2alpha1() autoscalingv2alpha1.AutoscalingV2alpha1Interface
AutoscalingV2beta1() autoscalingv2beta1.AutoscalingV2beta1Interface
BatchV1() batchv1.BatchV1Interface
// Deprecated: please explicitly pick a version if possible.
Batch() batchv1.BatchV1Interface
@ -117,7 +117,7 @@ type Clientset struct {
authorizationV1 *authorizationv1.AuthorizationV1Client
authorizationV1beta1 *authorizationv1beta1.AuthorizationV1beta1Client
autoscalingV1 *autoscalingv1.AutoscalingV1Client
autoscalingV2alpha1 *autoscalingv2alpha1.AutoscalingV2alpha1Client
autoscalingV2beta1 *autoscalingv2beta1.AutoscalingV2beta1Client
batchV1 *batchv1.BatchV1Client
batchV1beta1 *batchv1beta1.BatchV1beta1Client
batchV2alpha1 *batchv2alpha1.BatchV2alpha1Client
@ -205,9 +205,9 @@ func (c *Clientset) Autoscaling() autoscalingv1.AutoscalingV1Interface {
return c.autoscalingV1
}
// AutoscalingV2alpha1 retrieves the AutoscalingV2alpha1Client
func (c *Clientset) AutoscalingV2alpha1() autoscalingv2alpha1.AutoscalingV2alpha1Interface {
return c.autoscalingV2alpha1
// AutoscalingV2beta1 retrieves the AutoscalingV2beta1Client
func (c *Clientset) AutoscalingV2beta1() autoscalingv2beta1.AutoscalingV2beta1Interface {
return c.autoscalingV2beta1
}
// BatchV1 retrieves the BatchV1Client
@ -393,7 +393,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
if err != nil {
return nil, err
}
cs.autoscalingV2alpha1, err = autoscalingv2alpha1.NewForConfig(&configShallowCopy)
cs.autoscalingV2beta1, err = autoscalingv2beta1.NewForConfig(&configShallowCopy)
if err != nil {
return nil, err
}
@ -478,7 +478,7 @@ func NewForConfigOrDie(c *rest.Config) *Clientset {
cs.authorizationV1 = authorizationv1.NewForConfigOrDie(c)
cs.authorizationV1beta1 = authorizationv1beta1.NewForConfigOrDie(c)
cs.autoscalingV1 = autoscalingv1.NewForConfigOrDie(c)
cs.autoscalingV2alpha1 = autoscalingv2alpha1.NewForConfigOrDie(c)
cs.autoscalingV2beta1 = autoscalingv2beta1.NewForConfigOrDie(c)
cs.batchV1 = batchv1.NewForConfigOrDie(c)
cs.batchV1beta1 = batchv1beta1.NewForConfigOrDie(c)
cs.batchV2alpha1 = batchv2alpha1.NewForConfigOrDie(c)
@ -510,7 +510,7 @@ func New(c rest.Interface) *Clientset {
cs.authorizationV1 = authorizationv1.New(c)
cs.authorizationV1beta1 = authorizationv1beta1.New(c)
cs.autoscalingV1 = autoscalingv1.New(c)
cs.autoscalingV2alpha1 = autoscalingv2alpha1.New(c)
cs.autoscalingV2beta1 = autoscalingv2beta1.New(c)
cs.batchV1 = batchv1.New(c)
cs.batchV1beta1 = batchv1beta1.New(c)
cs.batchV2alpha1 = batchv2alpha1.New(c)

6
staging/src/k8s.io/client-go/kubernetes/fake/BUILD
View File

@ -21,7 +21,7 @@ go_library(
"//vendor/k8s.io/api/authorization/v1:go_default_library",
"//vendor/k8s.io/api/authorization/v1beta1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/api/batch/v1:go_default_library",
"//vendor/k8s.io/api/batch/v1beta1:go_default_library",
"//vendor/k8s.io/api/batch/v2alpha1:go_default_library",
@ -61,8 +61,8 @@ go_library(
"//vendor/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v1:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/batch/v1:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/batch/v1/fake:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/batch/v1beta1:go_default_library",

10
staging/src/k8s.io/client-go/kubernetes/fake/clientset_generated.go
View File

@ -38,8 +38,8 @@ import (
fakeauthorizationv1beta1 "k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake"
autoscalingv1 "k8s.io/client-go/kubernetes/typed/autoscaling/v1"
fakeautoscalingv1 "k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake"
autoscalingv2alpha1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1"
fakeautoscalingv2alpha1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake"
autoscalingv2beta1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1"
fakeautoscalingv2beta1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake"
batchv1 "k8s.io/client-go/kubernetes/typed/batch/v1"
fakebatchv1 "k8s.io/client-go/kubernetes/typed/batch/v1/fake"
batchv1beta1 "k8s.io/client-go/kubernetes/typed/batch/v1beta1"
@ -171,9 +171,9 @@ func (c *Clientset) Autoscaling() autoscalingv1.AutoscalingV1Interface {
return &fakeautoscalingv1.FakeAutoscalingV1{Fake: &c.Fake}
}
// AutoscalingV2alpha1 retrieves the AutoscalingV2alpha1Client
func (c *Clientset) AutoscalingV2alpha1() autoscalingv2alpha1.AutoscalingV2alpha1Interface {
return &fakeautoscalingv2alpha1.FakeAutoscalingV2alpha1{Fake: &c.Fake}
// AutoscalingV2beta1 retrieves the AutoscalingV2beta1Client
func (c *Clientset) AutoscalingV2beta1() autoscalingv2beta1.AutoscalingV2beta1Interface {
return &fakeautoscalingv2beta1.FakeAutoscalingV2beta1{Fake: &c.Fake}
}
// BatchV1 retrieves the BatchV1Client

4
staging/src/k8s.io/client-go/kubernetes/fake/register.go
View File

@ -25,7 +25,7 @@ import (
authorizationv1 "k8s.io/api/authorization/v1"
authorizationv1beta1 "k8s.io/api/authorization/v1beta1"
autoscalingv1 "k8s.io/api/autoscaling/v1"
autoscalingv2alpha1 "k8s.io/api/autoscaling/v2alpha1"
autoscalingv2beta1 "k8s.io/api/autoscaling/v2beta1"
batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
batchv2alpha1 "k8s.io/api/batch/v2alpha1"
@ -79,7 +79,7 @@ func AddToScheme(scheme *runtime.Scheme) {
authorizationv1.AddToScheme(scheme)
authorizationv1beta1.AddToScheme(scheme)
autoscalingv1.AddToScheme(scheme)
autoscalingv2alpha1.AddToScheme(scheme)
autoscalingv2beta1.AddToScheme(scheme)
batchv1.AddToScheme(scheme)
batchv1beta1.AddToScheme(scheme)
batchv2alpha1.AddToScheme(scheme)

2
staging/src/k8s.io/client-go/kubernetes/scheme/BUILD
View File

@ -20,7 +20,7 @@ go_library(
"//vendor/k8s.io/api/authorization/v1:go_default_library",
"//vendor/k8s.io/api/authorization/v1beta1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/api/batch/v1:go_default_library",
"//vendor/k8s.io/api/batch/v1beta1:go_default_library",
"//vendor/k8s.io/api/batch/v2alpha1:go_default_library",

4
staging/src/k8s.io/client-go/kubernetes/scheme/register.go
View File

@ -25,7 +25,7 @@ import (
authorizationv1 "k8s.io/api/authorization/v1"
authorizationv1beta1 "k8s.io/api/authorization/v1beta1"
autoscalingv1 "k8s.io/api/autoscaling/v1"
autoscalingv2alpha1 "k8s.io/api/autoscaling/v2alpha1"
autoscalingv2beta1 "k8s.io/api/autoscaling/v2beta1"
batchv1 "k8s.io/api/batch/v1"
batchv1beta1 "k8s.io/api/batch/v1beta1"
batchv2alpha1 "k8s.io/api/batch/v2alpha1"
@ -79,7 +79,7 @@ func AddToScheme(scheme *runtime.Scheme) {
authorizationv1.AddToScheme(scheme)
authorizationv1beta1.AddToScheme(scheme)
autoscalingv1.AddToScheme(scheme)
autoscalingv2alpha1.AddToScheme(scheme)
autoscalingv2beta1.AddToScheme(scheme)
batchv1.AddToScheme(scheme)
batchv1beta1.AddToScheme(scheme)
batchv2alpha1.AddToScheme(scheme)

13
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/BUILD → staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/BUILD
View File

@ -1,9 +1,4 @@
package(default_visibility = ["//visibility:public"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
@ -13,8 +8,9 @@ go_library(
"generated_expansion.go",
"horizontalpodautoscaler.go",
],
visibility = ["//visibility:public"],
deps = [
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
@ -35,7 +31,8 @@ filegroup(
name = "all-srcs",
srcs = [
":package-srcs",
"//staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake:all-srcs",
"//staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake:all-srcs",
],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

32
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/autoscaling_client.go → staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/autoscaling_client.go
View File

@ -14,31 +14,31 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package v2alpha1
package v2beta1
import (
v2alpha1 "k8s.io/api/autoscaling/v2alpha1"
v2beta1 "k8s.io/api/autoscaling/v2beta1"
serializer "k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/client-go/kubernetes/scheme"
rest "k8s.io/client-go/rest"
)
type AutoscalingV2alpha1Interface interface {
type AutoscalingV2beta1Interface interface {
RESTClient() rest.Interface
HorizontalPodAutoscalersGetter
}
// AutoscalingV2alpha1Client is used to interact with features provided by the autoscaling group.
type AutoscalingV2alpha1Client struct {
// AutoscalingV2beta1Client is used to interact with features provided by the autoscaling group.
type AutoscalingV2beta1Client struct {
restClient rest.Interface
}
func (c *AutoscalingV2alpha1Client) HorizontalPodAutoscalers(namespace string) HorizontalPodAutoscalerInterface {
func (c *AutoscalingV2beta1Client) HorizontalPodAutoscalers(namespace string) HorizontalPodAutoscalerInterface {
return newHorizontalPodAutoscalers(c, namespace)
}
// NewForConfig creates a new AutoscalingV2alpha1Client for the given config.
func NewForConfig(c *rest.Config) (*AutoscalingV2alpha1Client, error) {
// NewForConfig creates a new AutoscalingV2beta1Client for the given config.
func NewForConfig(c *rest.Config) (*AutoscalingV2beta1Client, error) {
config := *c
if err := setConfigDefaults(&config); err != nil {
return nil, err
@ -47,12 +47,12 @@ func NewForConfig(c *rest.Config) (*AutoscalingV2alpha1Client, error) {
if err != nil {
return nil, err
}
return &AutoscalingV2alpha1Client{client}, nil
return &AutoscalingV2beta1Client{client}, nil
}
// NewForConfigOrDie creates a new AutoscalingV2alpha1Client for the given config and
// NewForConfigOrDie creates a new AutoscalingV2beta1Client for the given config and
// panics if there is an error in the config.
func NewForConfigOrDie(c *rest.Config) *AutoscalingV2alpha1Client {
func NewForConfigOrDie(c *rest.Config) *AutoscalingV2beta1Client {
client, err := NewForConfig(c)
if err != nil {
panic(err)
@ -60,13 +60,13 @@ func NewForConfigOrDie(c *rest.Config) *AutoscalingV2alpha1Client {
return client
}
// New creates a new AutoscalingV2alpha1Client for the given RESTClient.
func New(c rest.Interface) *AutoscalingV2alpha1Client {
return &AutoscalingV2alpha1Client{c}
// New creates a new AutoscalingV2beta1Client for the given RESTClient.
func New(c rest.Interface) *AutoscalingV2beta1Client {
return &AutoscalingV2beta1Client{c}
}
func setConfigDefaults(config *rest.Config) error {
gv := v2alpha1.SchemeGroupVersion
gv := v2beta1.SchemeGroupVersion
config.GroupVersion = &gv
config.APIPath = "/apis"
config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
@ -80,7 +80,7 @@ func setConfigDefaults(config *rest.Config) error {
// RESTClient returns a RESTClient that is used to communicate
// with API server by this client implementation.
func (c *AutoscalingV2alpha1Client) RESTClient() rest.Interface {
func (c *AutoscalingV2beta1Client) RESTClient() rest.Interface {
if c == nil {
return nil
}

2
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/doc.go → staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/doc.go
View File

@ -17,4 +17,4 @@ limitations under the License.
// This package is generated by client-gen with custom arguments.
// This package has the automatically generated typed clients.
package v2alpha1
package v2beta1

13
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake/BUILD → staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake/BUILD
View File

@ -1,9 +1,4 @@
package(default_visibility = ["//visibility:public"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
@ -12,14 +7,15 @@ go_library(
"fake_autoscaling_client.go",
"fake_horizontalpodautoscaler.go",
],
visibility = ["//visibility:public"],
deps = [
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/client-go/rest:go_default_library",
"//vendor/k8s.io/client-go/testing:go_default_library",
],
@ -36,4 +32,5 @@ filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

0
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake/doc.go → staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake/doc.go
View File

8
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake/fake_autoscaling_client.go → staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake/fake_autoscaling_client.go
View File

@ -17,22 +17,22 @@ limitations under the License.
package fake
import (
v2alpha1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1"
v2beta1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1"
rest "k8s.io/client-go/rest"
testing "k8s.io/client-go/testing"
)
type FakeAutoscalingV2alpha1 struct {
type FakeAutoscalingV2beta1 struct {
*testing.Fake
}
func (c *FakeAutoscalingV2alpha1) HorizontalPodAutoscalers(namespace string) v2alpha1.HorizontalPodAutoscalerInterface {
func (c *FakeAutoscalingV2beta1) HorizontalPodAutoscalers(namespace string) v2beta1.HorizontalPodAutoscalerInterface {
return &FakeHorizontalPodAutoscalers{c, namespace}
}
// RESTClient returns a RESTClient that is used to communicate
// with API server by this client implementation.
func (c *FakeAutoscalingV2alpha1) RESTClient() rest.Interface {
func (c *FakeAutoscalingV2beta1) RESTClient() rest.Interface {
var ret *rest.RESTClient
return ret
}

50
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake/fake_horizontalpodautoscaler.go → staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake/fake_horizontalpodautoscaler.go
View File

@ -17,7 +17,7 @@ limitations under the License.
package fake
import (
v2alpha1 "k8s.io/api/autoscaling/v2alpha1"
v2beta1 "k8s.io/api/autoscaling/v2beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema"
@ -28,29 +28,29 @@ import (
// FakeHorizontalPodAutoscalers implements HorizontalPodAutoscalerInterface
type FakeHorizontalPodAutoscalers struct {
Fake *FakeAutoscalingV2alpha1
Fake *FakeAutoscalingV2beta1
ns string
}
var horizontalpodautoscalersResource = schema.GroupVersionResource{Group: "autoscaling", Version: "v2alpha1", Resource: "horizontalpodautoscalers"}
var horizontalpodautoscalersResource = schema.GroupVersionResource{Group: "autoscaling", Version: "v2beta1", Resource: "horizontalpodautoscalers"}
var horizontalpodautoscalersKind = schema.GroupVersionKind{Group: "autoscaling", Version: "v2alpha1", Kind: "HorizontalPodAutoscaler"}
var horizontalpodautoscalersKind = schema.GroupVersionKind{Group: "autoscaling", Version: "v2beta1", Kind: "HorizontalPodAutoscaler"}
// Get takes name of the horizontalPodAutoscaler, and returns the corresponding horizontalPodAutoscaler object, and an error if there is any.
func (c *FakeHorizontalPodAutoscalers) Get(name string, options v1.GetOptions) (result *v2alpha1.HorizontalPodAutoscaler, err error) {
func (c *FakeHorizontalPodAutoscalers) Get(name string, options v1.GetOptions) (result *v2beta1.HorizontalPodAutoscaler, err error) {
obj, err := c.Fake.
Invokes(testing.NewGetAction(horizontalpodautoscalersResource, c.ns, name), &v2alpha1.HorizontalPodAutoscaler{})
Invokes(testing.NewGetAction(horizontalpodautoscalersResource, c.ns, name), &v2beta1.HorizontalPodAutoscaler{})
if obj == nil {
return nil, err
}
return obj.(*v2alpha1.HorizontalPodAutoscaler), err
return obj.(*v2beta1.HorizontalPodAutoscaler), err
}
// List takes label and field selectors, and returns the list of HorizontalPodAutoscalers that match those selectors.
func (c *FakeHorizontalPodAutoscalers) List(opts v1.ListOptions) (result *v2alpha1.HorizontalPodAutoscalerList, err error) {
func (c *FakeHorizontalPodAutoscalers) List(opts v1.ListOptions) (result *v2beta1.HorizontalPodAutoscalerList, err error) {
obj, err := c.Fake.
Invokes(testing.NewListAction(horizontalpodautoscalersResource, horizontalpodautoscalersKind, c.ns, opts), &v2alpha1.HorizontalPodAutoscalerList{})
Invokes(testing.NewListAction(horizontalpodautoscalersResource, horizontalpodautoscalersKind, c.ns, opts), &v2beta1.HorizontalPodAutoscalerList{})
if obj == nil {
return nil, err
@ -60,8 +60,8 @@ func (c *FakeHorizontalPodAutoscalers) List(opts v1.ListOptions) (result *v2alph
if label == nil {
label = labels.Everything()
}
list := &v2alpha1.HorizontalPodAutoscalerList{}
for _, item := range obj.(*v2alpha1.HorizontalPodAutoscalerList).Items {
list := &v2beta1.HorizontalPodAutoscalerList{}
for _, item := range obj.(*v2beta1.HorizontalPodAutoscalerList).Items {
if label.Matches(labels.Set(item.Labels)) {
list.Items = append(list.Items, item)
}
@ -77,43 +77,43 @@ func (c *FakeHorizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interfa
}
// Create takes the representation of a horizontalPodAutoscaler and creates it. Returns the server's representation of the horizontalPodAutoscaler, and an error, if there is any.
func (c *FakeHorizontalPodAutoscalers) Create(horizontalPodAutoscaler *v2alpha1.HorizontalPodAutoscaler) (result *v2alpha1.HorizontalPodAutoscaler, err error) {
func (c *FakeHorizontalPodAutoscalers) Create(horizontalPodAutoscaler *v2beta1.HorizontalPodAutoscaler) (result *v2beta1.HorizontalPodAutoscaler, err error) {
obj, err := c.Fake.
Invokes(testing.NewCreateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v2alpha1.HorizontalPodAutoscaler{})
Invokes(testing.NewCreateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v2beta1.HorizontalPodAutoscaler{})
if obj == nil {
return nil, err
}
return obj.(*v2alpha1.HorizontalPodAutoscaler), err
return obj.(*v2beta1.HorizontalPodAutoscaler), err
}
// Update takes the representation of a horizontalPodAutoscaler and updates it. Returns the server's representation of the horizontalPodAutoscaler, and an error, if there is any.
func (c *FakeHorizontalPodAutoscalers) Update(horizontalPodAutoscaler *v2alpha1.HorizontalPodAutoscaler) (result *v2alpha1.HorizontalPodAutoscaler, err error) {
func (c *FakeHorizontalPodAutoscalers) Update(horizontalPodAutoscaler *v2beta1.HorizontalPodAutoscaler) (result *v2beta1.HorizontalPodAutoscaler, err error) {
obj, err := c.Fake.
Invokes(testing.NewUpdateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v2alpha1.HorizontalPodAutoscaler{})
Invokes(testing.NewUpdateAction(horizontalpodautoscalersResource, c.ns, horizontalPodAutoscaler), &v2beta1.HorizontalPodAutoscaler{})
if obj == nil {
return nil, err
}
return obj.(*v2alpha1.HorizontalPodAutoscaler), err
return obj.(*v2beta1.HorizontalPodAutoscaler), err
}
// UpdateStatus was generated because the type contains a Status member.
// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
func (c *FakeHorizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v2alpha1.HorizontalPodAutoscaler) (*v2alpha1.HorizontalPodAutoscaler, error) {
func (c *FakeHorizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v2beta1.HorizontalPodAutoscaler) (*v2beta1.HorizontalPodAutoscaler, error) {
obj, err := c.Fake.
Invokes(testing.NewUpdateSubresourceAction(horizontalpodautoscalersResource, "status", c.ns, horizontalPodAutoscaler), &v2alpha1.HorizontalPodAutoscaler{})
Invokes(testing.NewUpdateSubresourceAction(horizontalpodautoscalersResource, "status", c.ns, horizontalPodAutoscaler), &v2beta1.HorizontalPodAutoscaler{})
if obj == nil {
return nil, err
}
return obj.(*v2alpha1.HorizontalPodAutoscaler), err
return obj.(*v2beta1.HorizontalPodAutoscaler), err
}
// Delete takes name of the horizontalPodAutoscaler and deletes it. Returns an error if one occurs.
func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *v1.DeleteOptions) error {
_, err := c.Fake.
Invokes(testing.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &v2alpha1.HorizontalPodAutoscaler{})
Invokes(testing.NewDeleteAction(horizontalpodautoscalersResource, c.ns, name), &v2beta1.HorizontalPodAutoscaler{})
return err
}
@ -122,17 +122,17 @@ func (c *FakeHorizontalPodAutoscalers) Delete(name string, options *v1.DeleteOpt
func (c *FakeHorizontalPodAutoscalers) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
action := testing.NewDeleteCollectionAction(horizontalpodautoscalersResource, c.ns, listOptions)
_, err := c.Fake.Invokes(action, &v2alpha1.HorizontalPodAutoscalerList{})
_, err := c.Fake.Invokes(action, &v2beta1.HorizontalPodAutoscalerList{})
return err
}
// Patch applies the patch and returns the patched horizontalPodAutoscaler.
func (c *FakeHorizontalPodAutoscalers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2alpha1.HorizontalPodAutoscaler, err error) {
func (c *FakeHorizontalPodAutoscalers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2beta1.HorizontalPodAutoscaler, err error) {
obj, err := c.Fake.
Invokes(testing.NewPatchSubresourceAction(horizontalpodautoscalersResource, c.ns, name, data, subresources...), &v2alpha1.HorizontalPodAutoscaler{})
Invokes(testing.NewPatchSubresourceAction(horizontalpodautoscalersResource, c.ns, name, data, subresources...), &v2beta1.HorizontalPodAutoscaler{})
if obj == nil {
return nil, err
}
return obj.(*v2alpha1.HorizontalPodAutoscaler), err
return obj.(*v2beta1.HorizontalPodAutoscaler), err
}

2
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/generated_expansion.go → staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/generated_expansion.go
View File

@ -14,6 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package v2alpha1
package v2beta1
type HorizontalPodAutoscalerExpansion interface{}

42
staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/horizontalpodautoscaler.go → staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/horizontalpodautoscaler.go
View File

@ -14,10 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package v2alpha1
package v2beta1
import (
v2alpha1 "k8s.io/api/autoscaling/v2alpha1"
v2beta1 "k8s.io/api/autoscaling/v2beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
@ -33,15 +33,15 @@ type HorizontalPodAutoscalersGetter interface {
// HorizontalPodAutoscalerInterface has methods to work with HorizontalPodAutoscaler resources.
type HorizontalPodAutoscalerInterface interface {
Create(*v2alpha1.HorizontalPodAutoscaler) (*v2alpha1.HorizontalPodAutoscaler, error)
Update(*v2alpha1.HorizontalPodAutoscaler) (*v2alpha1.HorizontalPodAutoscaler, error)
UpdateStatus(*v2alpha1.HorizontalPodAutoscaler) (*v2alpha1.HorizontalPodAutoscaler, error)
Create(*v2beta1.HorizontalPodAutoscaler) (*v2beta1.HorizontalPodAutoscaler, error)
Update(*v2beta1.HorizontalPodAutoscaler) (*v2beta1.HorizontalPodAutoscaler, error)
UpdateStatus(*v2beta1.HorizontalPodAutoscaler) (*v2beta1.HorizontalPodAutoscaler, error)
Delete(name string, options *v1.DeleteOptions) error
DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
Get(name string, options v1.GetOptions) (*v2alpha1.HorizontalPodAutoscaler, error)
List(opts v1.ListOptions) (*v2alpha1.HorizontalPodAutoscalerList, error)
Get(name string, options v1.GetOptions) (*v2beta1.HorizontalPodAutoscaler, error)
List(opts v1.ListOptions) (*v2beta1.HorizontalPodAutoscalerList, error)
Watch(opts v1.ListOptions) (watch.Interface, error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2alpha1.HorizontalPodAutoscaler, err error)
Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2beta1.HorizontalPodAutoscaler, err error)
HorizontalPodAutoscalerExpansion
}
@ -52,7 +52,7 @@ type horizontalPodAutoscalers struct {
}
// newHorizontalPodAutoscalers returns a HorizontalPodAutoscalers
func newHorizontalPodAutoscalers(c *AutoscalingV2alpha1Client, namespace string) *horizontalPodAutoscalers {
func newHorizontalPodAutoscalers(c *AutoscalingV2beta1Client, namespace string) *horizontalPodAutoscalers {
return &horizontalPodAutoscalers{
client: c.RESTClient(),
ns: namespace,
@ -60,8 +60,8 @@ func newHorizontalPodAutoscalers(c *AutoscalingV2alpha1Client, namespace string)
}
// Get takes name of the horizontalPodAutoscaler, and returns the corresponding horizontalPodAutoscaler object, and an error if there is any.
func (c *horizontalPodAutoscalers) Get(name string, options v1.GetOptions) (result *v2alpha1.HorizontalPodAutoscaler, err error) {
result = &v2alpha1.HorizontalPodAutoscaler{}
func (c *horizontalPodAutoscalers) Get(name string, options v1.GetOptions) (result *v2beta1.HorizontalPodAutoscaler, err error) {
result = &v2beta1.HorizontalPodAutoscaler{}
err = c.client.Get().
Namespace(c.ns).
Resource("horizontalpodautoscalers").
@ -73,8 +73,8 @@ func (c *horizontalPodAutoscalers) Get(name string, options v1.GetOptions) (resu
}
// List takes label and field selectors, and returns the list of HorizontalPodAutoscalers that match those selectors.
func (c *horizontalPodAutoscalers) List(opts v1.ListOptions) (result *v2alpha1.HorizontalPodAutoscalerList, err error) {
result = &v2alpha1.HorizontalPodAutoscalerList{}
func (c *horizontalPodAutoscalers) List(opts v1.ListOptions) (result *v2beta1.HorizontalPodAutoscalerList, err error) {
result = &v2beta1.HorizontalPodAutoscalerList{}
err = c.client.Get().
Namespace(c.ns).
Resource("horizontalpodautoscalers").
@ -95,8 +95,8 @@ func (c *horizontalPodAutoscalers) Watch(opts v1.ListOptions) (watch.Interface,
}
// Create takes the representation of a horizontalPodAutoscaler and creates it. Returns the server's representation of the horizontalPodAutoscaler, and an error, if there is any.
func (c *horizontalPodAutoscalers) Create(horizontalPodAutoscaler *v2alpha1.HorizontalPodAutoscaler) (result *v2alpha1.HorizontalPodAutoscaler, err error) {
result = &v2alpha1.HorizontalPodAutoscaler{}
func (c *horizontalPodAutoscalers) Create(horizontalPodAutoscaler *v2beta1.HorizontalPodAutoscaler) (result *v2beta1.HorizontalPodAutoscaler, err error) {
result = &v2beta1.HorizontalPodAutoscaler{}
err = c.client.Post().
Namespace(c.ns).
Resource("horizontalpodautoscalers").
@ -107,8 +107,8 @@ func (c *horizontalPodAutoscalers) Create(horizontalPodAutoscaler *v2alpha1.Hori
}
// Update takes the representation of a horizontalPodAutoscaler and updates it. Returns the server's representation of the horizontalPodAutoscaler, and an error, if there is any.
func (c *horizontalPodAutoscalers) Update(horizontalPodAutoscaler *v2alpha1.HorizontalPodAutoscaler) (result *v2alpha1.HorizontalPodAutoscaler, err error) {
result = &v2alpha1.HorizontalPodAutoscaler{}
func (c *horizontalPodAutoscalers) Update(horizontalPodAutoscaler *v2beta1.HorizontalPodAutoscaler) (result *v2beta1.HorizontalPodAutoscaler, err error) {
result = &v2beta1.HorizontalPodAutoscaler{}
err = c.client.Put().
Namespace(c.ns).
Resource("horizontalpodautoscalers").
@ -122,8 +122,8 @@ func (c *horizontalPodAutoscalers) Update(horizontalPodAutoscaler *v2alpha1.Hori
// UpdateStatus was generated because the type contains a Status member.
// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
func (c *horizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v2alpha1.HorizontalPodAutoscaler) (result *v2alpha1.HorizontalPodAutoscaler, err error) {
result = &v2alpha1.HorizontalPodAutoscaler{}
func (c *horizontalPodAutoscalers) UpdateStatus(horizontalPodAutoscaler *v2beta1.HorizontalPodAutoscaler) (result *v2beta1.HorizontalPodAutoscaler, err error) {
result = &v2beta1.HorizontalPodAutoscaler{}
err = c.client.Put().
Namespace(c.ns).
Resource("horizontalpodautoscalers").
@ -158,8 +158,8 @@ func (c *horizontalPodAutoscalers) DeleteCollection(options *v1.DeleteOptions, l
}
// Patch applies the patch and returns the patched horizontalPodAutoscaler.
func (c *horizontalPodAutoscalers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2alpha1.HorizontalPodAutoscaler, err error) {
result = &v2alpha1.HorizontalPodAutoscaler{}
func (c *horizontalPodAutoscalers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v2beta1.HorizontalPodAutoscaler, err error) {
result = &v2beta1.HorizontalPodAutoscaler{}
err = c.client.Patch(pt).
Namespace(c.ns).
Resource("horizontalpodautoscalers").

9
staging/src/k8s.io/client-go/listers/autoscaling/v1/BUILD
View File

@ -1,9 +1,4 @@
package(default_visibility = ["//visibility:public"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
@ -11,6 +6,7 @@ go_library(
"expansion_generated.go",
"horizontalpodautoscaler.go",
],
visibility = ["//visibility:public"],
deps = [
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
@ -30,4 +26,5 @@ filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

11
staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/BUILD → staging/src/k8s.io/client-go/listers/autoscaling/v2beta1/BUILD
View File

@ -1,9 +1,4 @@
package(default_visibility = ["//visibility:public"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
name = "go_default_library",
@ -11,8 +6,9 @@ go_library(
"expansion_generated.go",
"horizontalpodautoscaler.go",
],
visibility = ["//visibility:public"],
deps = [
"//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
"//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/client-go/tools/cache:go_default_library",
@ -30,4 +26,5 @@ filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)

2
staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/expansion_generated.go → staging/src/k8s.io/client-go/listers/autoscaling/v2beta1/expansion_generated.go
View File

@ -16,7 +16,7 @@ limitations under the License.
// This file was automatically generated by lister-gen
package v2alpha1
package v2beta1
// HorizontalPodAutoscalerListerExpansion allows custom methods to be added to
// HorizontalPodAutoscalerLister.

24
staging/src/k8s.io/client-go/listers/autoscaling/v2alpha1/horizontalpodautoscaler.go → staging/src/k8s.io/client-go/listers/autoscaling/v2beta1/horizontalpodautoscaler.go
View File

@ -16,10 +16,10 @@ limitations under the License.
// This file was automatically generated by lister-gen
package v2alpha1
package v2beta1
import (
v2alpha1 "k8s.io/api/autoscaling/v2alpha1"
v2beta1 "k8s.io/api/autoscaling/v2beta1"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/client-go/tools/cache"
@ -28,7 +28,7 @@ import (
// HorizontalPodAutoscalerLister helps list HorizontalPodAutoscalers.
type HorizontalPodAutoscalerLister interface {
// List lists all HorizontalPodAutoscalers in the indexer.
List(selector labels.Selector) (ret []*v2alpha1.HorizontalPodAutoscaler, err error)
List(selector labels.Selector) (ret []*v2beta1.HorizontalPodAutoscaler, err error)
// HorizontalPodAutoscalers returns an object that can list and get HorizontalPodAutoscalers.
HorizontalPodAutoscalers(namespace string) HorizontalPodAutoscalerNamespaceLister
HorizontalPodAutoscalerListerExpansion
@ -45,9 +45,9 @@ func NewHorizontalPodAutoscalerLister(indexer cache.Indexer) HorizontalPodAutosc
}
// List lists all HorizontalPodAutoscalers in the indexer.
func (s *horizontalPodAutoscalerLister) List(selector labels.Selector) (ret []*v2alpha1.HorizontalPodAutoscaler, err error) {
func (s *horizontalPodAutoscalerLister) List(selector labels.Selector) (ret []*v2beta1.HorizontalPodAutoscaler, err error) {
err = cache.ListAll(s.indexer, selector, func(m interface{}) {
ret = append(ret, m.(*v2alpha1.HorizontalPodAutoscaler))
ret = append(ret, m.(*v2beta1.HorizontalPodAutoscaler))
})
return ret, err
}
@ -60,9 +60,9 @@ func (s *horizontalPodAutoscalerLister) HorizontalPodAutoscalers(namespace strin
// HorizontalPodAutoscalerNamespaceLister helps list and get HorizontalPodAutoscalers.
type HorizontalPodAutoscalerNamespaceLister interface {
// List lists all HorizontalPodAutoscalers in the indexer for a given namespace.
List(selector labels.Selector) (ret []*v2alpha1.HorizontalPodAutoscaler, err error)
List(selector labels.Selector) (ret []*v2beta1.HorizontalPodAutoscaler, err error)
// Get retrieves the HorizontalPodAutoscaler from the indexer for a given namespace and name.
Get(name string) (*v2alpha1.HorizontalPodAutoscaler, error)
Get(name string) (*v2beta1.HorizontalPodAutoscaler, error)
HorizontalPodAutoscalerNamespaceListerExpansion
}
@ -74,21 +74,21 @@ type horizontalPodAutoscalerNamespaceLister struct {
}
// List lists all HorizontalPodAutoscalers in the indexer for a given namespace.
func (s horizontalPodAutoscalerNamespaceLister) List(selector labels.Selector) (ret []*v2alpha1.HorizontalPodAutoscaler, err error) {
func (s horizontalPodAutoscalerNamespaceLister) List(selector labels.Selector) (ret []*v2beta1.HorizontalPodAutoscaler, err error) {
err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
ret = append(ret, m.(*v2alpha1.HorizontalPodAutoscaler))
ret = append(ret, m.(*v2beta1.HorizontalPodAutoscaler))
})
return ret, err
}
// Get retrieves the HorizontalPodAutoscaler from the indexer for a given namespace and name.
func (s horizontalPodAutoscalerNamespaceLister) Get(name string) (*v2alpha1.HorizontalPodAutoscaler, error) {
func (s horizontalPodAutoscalerNamespaceLister) Get(name string) (*v2beta1.HorizontalPodAutoscaler, error) {
obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
if err != nil {
return nil, err
}
if !exists {
return nil, errors.NewNotFound(v2alpha1.Resource("horizontalpodautoscaler"), name)
return nil, errors.NewNotFound(v2beta1.Resource("horizontalpodautoscaler"), name)
}
return obj.(*v2alpha1.HorizontalPodAutoscaler), nil
return obj.(*v2beta1.HorizontalPodAutoscaler), nil
}

2
staging/src/k8s.io/code-generator/cmd/go-to-protobuf/protobuf/cmd.go
View File

@ -76,7 +76,7 @@ func New() *Generator {
`k8s.io/api/extensions/v1beta1`,
`k8s.io/api/autoscaling/v1`,
`k8s.io/api/authorization/v1`,
`k8s.io/api/autoscaling/v2alpha1`,
`k8s.io/api/autoscaling/v2beta1`,
`k8s.io/api/authorization/v1beta1`,
`k8s.io/api/batch/v1`,
`k8s.io/api/batch/v1beta1`,

4
test/integration/etcd/etcd_storage_path_test.go
View File

@ -181,8 +181,8 @@ var etcdStorageData = map[schema.GroupVersionResource]struct {
},
// --
// k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1
gvr("autoscaling", "v2alpha1", "horizontalpodautoscalers"): {
// k8s.io/kubernetes/pkg/apis/autoscaling/v2beta1
gvr("autoscaling", "v2beta1", "horizontalpodautoscalers"): {
stub: `{"metadata": {"name": "hpa1"}, "spec": {"maxReplicas": 3, "scaleTargetRef": {"kind": "something", "name": "cross"}}}`,
expectedEtcdPath: "/registry/horizontalpodautoscalers/etcdstoragepathtestnamespace/hpa1",
expectedGVK: gvkP("autoscaling", "v1", "HorizontalPodAutoscaler"),