diff --git a/pkg/api/serialization_test.go b/pkg/api/serialization_test.go index cc19b4d1d1c..6eed0666be9 100644 --- a/pkg/api/serialization_test.go +++ b/pkg/api/serialization_test.go @@ -32,6 +32,9 @@ import ( "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/util" + _ "k8s.io/kubernetes/pkg/expapi" + _ "k8s.io/kubernetes/pkg/expapi/v1" + flag "github.com/spf13/pflag" ) diff --git a/pkg/expapi/types.go b/pkg/expapi/types.go index eb2fddfe191..77954f67697 100644 --- a/pkg/expapi/types.go +++ b/pkg/expapi/types.go @@ -98,12 +98,12 @@ type HorizontalPodAutoscalerSpec struct { // HorizontalPodAutoscalerStatus contains the current status of a horizontal pod autoscaler type HorizontalPodAutoscalerStatus struct { // CurrentReplicas is the number of replicas of pods managed by this autoscaler. - CurrentReplicas int `json:"replicas"` + CurrentReplicas int `json:"currentReplicas"` // DesiredReplicas is the desired number of replicas of pods managed by this autoscaler. // The number may be different because pod downscaling is someteimes delayed to keep the number // of pods stable. - DesiredReplicas int `json:"replicas"` + DesiredReplicas int `json:"desiredReplicas"` // CurrentConsumption is the current average consumption of the given resource that the autoscaler will // try to maintain by adjusting the desired number of pods. diff --git a/pkg/expapi/v1/types.go b/pkg/expapi/v1/types.go index 512f55e4c98..abfec1b2ced 100644 --- a/pkg/expapi/v1/types.go +++ b/pkg/expapi/v1/types.go @@ -86,10 +86,10 @@ type HorizontalPodAutoscalerSpec struct { // HorizontalPodAutoscalerStatus contains the current status of a horizontal pod autoscaler type HorizontalPodAutoscalerStatus struct { // CurrentReplicas is the number of replicas of pods managed by this autoscaler. - CurrentReplicas int `json:"replicas" description:"number of replicas observed by the autoscaler"` + CurrentReplicas int `json:"currentReplicas" description:"number of replicas observed by the autoscaler"` // DesiredReplicas is the desired number of replicas of pods managed by this autoscaler. - DesiredReplicas int `json:"replicas" description:"number of desired replicas"` + DesiredReplicas int `json:"desiredReplicas" description:"number of desired replicas"` // CurrentConsumption is the current average consumption of the given resource that the autoscaler will // try to maintain by adjusting the desired number of pods.